Remove 'default log' and <options:loglevel> (wtf?)

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index 3120d3d59b69fb5267b9f3fc7eb5ef7a90b8ce50..3293aac83544ea04fda81c4e87c6813b4fad7cd7 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -203,9 +203,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.
@@ -483,10 +490,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.
         */
@@ -539,10 +542,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)
@@ -752,27 +753,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