X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=af9c33533b02649c64065d4d4cd5b6d973aeb0d4;hb=61fed23a3e9a62f19c2f88208585b31356c986ef;hp=2556cf08898b9fecb3c114c91c2a63d5aa4969c5;hpb=f5151d1bbcf5c4c3cff57ff8a8129940ede35d73;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 2556cf088..af9c33533 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -26,7 +26,6 @@
 #include <vector>
 #include <map>
 #include "inspircd.h"
-#include "globals.h"
 #include "modules.h"
 #include "socketengine.h"
 #include "socket.h"
@@ -253,7 +252,6 @@ class ServerLimits : public Extensible
 	{
 		NickMax++;
 		ChanMax++;
-		MaxModes++;
 		IdentMax++;
 		MaxQuit++;
 		MaxTopic++;
@@ -286,14 +284,13 @@ class CoreExport ServerConfig : public Extensible
 	 * configutation, appending errors to errorstream
 	 * and setting error if an error has occured.
 	 */
-	bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream);
+	bool ParseLine(ConfigDataHash &target, const std::string &filename, std::string &line, long &linenumber, std::ostringstream &errorstream);
 
 	/** Check that there is only one of each configuration item
 	 */
 	bool CheckOnce(const char* tag, ConfigDataHash &newconf);
 
  public:
-
 	/** Process an include executable directive
 	 */
 	bool DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream);
@@ -329,6 +326,16 @@ class CoreExport ServerConfig : public Extensible
 
 	ServerLimits Limits;
 
+	/** Clones CIDR range for ipv4 (0-32)
+	 * Defaults to 32 (checks clones on all IPs seperately)
+	 */
+	int c_ipv4_range;
+
+	/** Clones CIDR range for ipv6 (0-128)
+	 * Defaults to 128 (checks on all IPs seperately)
+	 */
+	int c_ipv6_range;
+
 	/** Max number of WhoWas entries per user.
 	 */
 	int WhoWasGroupSize;
@@ -432,12 +439,25 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	char DNSServer[MAXBUF];
 
+	/** Pretend disabled commands don't exist.
+	 */
+	bool DisabledDontExist;
+
 	/** This variable contains a space-seperated list
 	 * of commands which are disabled by the
 	 * administrator of the server for non-opers.
 	 */
 	char DisabledCommands[MAXBUF];
 
+	/** This variable identifies which usermodes have been diabled.
+	 */
+
+	char DisabledUModes[64];
+
+	/** This variable identifies which chanmodes have been disabled.
+	 */
+	char DisabledCModes[64];
+
 	/** The full path to the modules directory.
 	 * This is either set at compile time, or
 	 * overridden in the configuration file via
@@ -587,10 +607,6 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	std::vector<ListenSocket*> ports;
 
-	/** socket objects that are attached to by modules
-	 */
-	std::map<BufferedSocket*, Module*> SocketIOHookModule;
-
 	/** The 005 tokens of this server (ISUPPORT)
 	 * populated/repopulated upon loading or unloading
 	 * modules.
@@ -803,26 +819,6 @@ class CoreExport ServerConfig : public Extensible
 
 	void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val);
 
-	/** Get a pointer to the module which has hooked the given BufferedSocket class.
-	 * @parameter port Port number
-	 * @return Returns a pointer to the hooking module, or NULL
-	 */
-	Module* GetIOHook(BufferedSocket* is);
-
-	/** Hook a module to an BufferedSocket class, so that it can receive notifications
-	 * of low-level socket activity.
-	 * @param iomod The module to hook to the socket
-	 * @param is The BufferedSocket to attach to
-	 * @return True if the hook was successful.
-	 */
-	bool AddIOHook(Module* iomod, BufferedSocket* is);
-
-	/** Delete a module hook from an BufferedSocket.
-	 * @param is The BufferedSocket to detatch from.
-	 * @return True if the unhook was successful
-	 */
-	bool DelIOHook(BufferedSocket* is);
-
 	/** Returns the fully qualified path to the inspircd directory
 	 * @return The full program directory
 	 */
@@ -845,7 +841,11 @@ class CoreExport ServerConfig : public Extensible
 	 * @return True if the file exists and is readable.
 	 */
 	static bool FileExists(const char* file);
-	
+
+	/** If this value is true, invites will bypass more than just +i
+	 */
+	bool InvBypassModes;
+
 };
 
 /** Initialize the disabled commands list