Allow fast sid reuse by erasing fake users from UserManager::uuidlist when the netspl...

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

diff --git a/include/configreader.h b/include/configreader.h
index 3cb75ad3760017c402d787724e2d0222a794363d..f3137ec0a982d1320be1856de07d62fd29e3c0f0 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -114,6 +114,8 @@ class ServerLimits
        size_t MaxAway;
        /** Maximum line length */
        size_t MaxLine;
+       /** Maximum hostname length */
+       size_t MaxHost;
 
        /** Creating the class initialises it to the defaults
         * as in 1.1's ./configure script. Reading other values
@@ -121,7 +123,7 @@ class ServerLimits
         */
        ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
                MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-               MaxLine(512) { }
+               MaxLine(512), MaxHost(64) { }
 };
 
 struct CommandLineConf
@@ -214,10 +216,10 @@ class CoreExport ServerConfig
                std::string Module;
 
                ServerPaths()
-                       : Config(CONFIG_PATH)
-                       , Data(DATA_PATH)
-                       , Log(LOG_PATH)
-                       , Module(MOD_PATH) { }
+                       : Config(INSPIRCD_CONFIG_PATH)
+                       , Data(INSPIRCD_DATA_PATH)
+                       , Log(INSPIRCD_LOG_PATH)
+                       , Module(INSPIRCD_MODULE_PATH) { }
 
                std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); }
                std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); }
@@ -225,6 +227,14 @@ class CoreExport ServerConfig
                std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); }
        };
 
+       /** Holds a complete list of all connect blocks
+        */
+       typedef std::vector<reference<ConnectClass> > ClassVector;
+
+       /** Index of valid oper blocks and types
+        */
+       typedef std::map<std::string, reference<OperInfo> > OperIndex;
+
        /** Get a configuration tag
         * @param tag The name of the tag to get
         */
@@ -444,11 +454,11 @@ class CoreExport ServerConfig
         */
        OperIndex OperTypes;
 
-       /** Max channels per user
+       /** Default value for <connect:maxchans>, deprecated in 2.2
         */
        unsigned int MaxChans;
 
-       /** Oper max channels per user
+       /** Default value for <oper:maxchans>, deprecated in 2.2
         */
        unsigned int OperMaxChans;