X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=aea3555833169e2e5014983a2d13779884c8ac63;hb=8c2d96013084de950e3a63be4ae6ed626c4093ab;hp=d7789b9ed2f51ece1ac85fa4a356a366b94f6383;hpb=9ce18436e94c2cdebeba90eba30b3c3e1ca311ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index d7789b9ed..aea355583 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -49,7 +49,8 @@ enum ConfigDataType
 	DT_IPADDRESS	 = 6,		/* IP address (v4, v6) */
 	DT_CHANNEL	 = 7,		/* Channel name */
 	DT_ALLOW_WILD	 = 64,		/* Allow wildcards/CIDR in DT_IPADDRESS */
-	DT_ALLOW_NEWLINE = 128		/* New line characters allowed in DT_CHARPTR */
+	DT_ALLOW_NEWLINE = 128,		/* New line characters allowed in DT_CHARPTR */
+	DT_BOOTONLY	 = 256		/* Can only be set on startup, not on rehash */
 };
 
 /** Holds a config value, either string, integer or boolean.
@@ -172,11 +173,18 @@ struct InitialConfig
 	/** Value containers */
 	ValueContainerBase* val;
 	/** Data types */
-	ConfigDataType datatype;
+	int datatype;
 	/** Validation function */
 	Validator validation_function;
 };
 
+struct Deprecated
+{
+	const char* tag;
+	const char* value;
+	const char* reason;
+};
+
 /** Holds a core configuration item and its callbacks
  * where there may be more than one item
  */
@@ -202,9 +210,16 @@ struct MultiConfig
  */
 typedef std::map<irc::string,char*> opertype_t;
 
+struct operclass_data : public Extensible
+{
+	char* commandlist;
+	char* cmodelist;
+	char* umodelist;
+};
+
 /** A Set of oper classes
  */
-typedef std::map<irc::string,char*> operclass_t;
+typedef std::map<irc::string, operclass_data> operclass_t;
 
 
 /** This class holds the bulk of the runtime configuration for the ircd.
@@ -234,7 +249,7 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Check that there is only one of each configuration item
 	 */
-	bool CheckOnce(const char* tag);
+	bool CheckOnce(const char* tag, ConfigDataHash &newconf);
 
  public:
 
@@ -482,10 +497,6 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	int debugging;
 
-	/** The loglevel in use by the IRC server
-	 */
-	int LogLevel;
-
 	/** How many seconds to wait before exiting
 	 * the program when /DIE is correctly issued.
 	 */
@@ -538,10 +549,8 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	std::vector<ListenSocket*> ports;
 
-	/** A list of ports claimed by IO Modules
+	/** socket objects that are attached to by modules
 	 */
-	std::map<int,Module*> IOHookModule;
-
 	std::map<BufferedSocket*, Module*> SocketIOHookModule;
 
 	/** The 005 tokens of this server (ISUPPORT)
@@ -751,27 +760,7 @@ class CoreExport ServerConfig : public Extensible
 	void ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild);
 
 	void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val);
-	
-	/** Get a pointer to the module which has hooked the given port.
-	 * @parameter port Port number
-	 * @return Returns a pointer to the hooking module, or NULL
-	 */
-	Module* GetIOHook(int port);
 
-	/** Hook a module to a client port, so that it can receive notifications
-	 * of low-level port activity.
-	 * @param port The port number
-	 * @param Module the module to hook to the port
-	 * @return True if the hook was successful.
-	 */
-	bool AddIOHook(int port, Module* iomod);
-
-	/** Delete a module hook from a client port.
-	 * @param port The port to detatch from
-	 * @return True if successful
-	 */
-	bool DelIOHook(int port);
-	
 	/** 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