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 46b8c5365f5396c051020cc78cdc47b226b43c75..f3137ec0a982d1320be1856de07d62fd29e3c0f0 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -83,8 +83,7 @@ class CoreExport ConfigTag : public refcountbase
        inline const std::vector<KeyVal>& getItems() const { return items; }
 
        /** Create a new ConfigTag, giving access to the private KeyVal item list */
-       static ConfigTag* create(const std::string& Tag, const std::string& file, int line,
-               std::vector<KeyVal>*&items);
+       static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
  private:
        ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -115,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
@@ -122,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
@@ -152,11 +153,6 @@ struct CommandLineConf
         */
        bool writelog;
 
-       /** True if we have been told to run the testsuite from the commandline,
-        * rather than entering the mainloop.
-        */
-       bool TestSuite;
-
        /** Saved argc from startup
         */
        int argc;
@@ -220,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); }
@@ -231,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
         */
@@ -303,57 +307,6 @@ class CoreExport ServerConfig
         */
        std::string ServerDesc;
 
-       /** Holds the admin's name, for output in
-        * the /ADMIN command.
-        */
-       std::string AdminName;
-
-       /** Holds the email address of the admin,
-        * for output in the /ADMIN command.
-        */
-       std::string AdminEmail;
-
-       /** Holds the admin's nickname, for output
-        * in the /ADMIN command
-        */
-       std::string AdminNick;
-
-       /** The admin-configured /DIE password
-        */
-       std::string diepass;
-
-       /** The admin-configured /RESTART password
-        */
-       std::string restartpass;
-
-       /** The hash method for *BOTH* the die and restart passwords.
-        */
-       std::string powerhash;
-
-       /** The quit prefix in use, or an empty string
-        */
-       std::string PrefixQuit;
-
-       /** The quit suffix in use, or an empty string
-        */
-       std::string SuffixQuit;
-
-       /** The fixed quit message in use, or an empty string
-        */
-       std::string FixedQuit;
-
-       /** The part prefix in use, or an empty string
-        */
-       std::string PrefixPart;
-
-       /** The part suffix in use, or an empty string
-        */
-       std::string SuffixPart;
-
-       /** The fixed part message in use, or an empty string
-        */
-       std::string FixedPart;
-
        /** Pretend disabled commands don't exist.
         */
        bool DisabledDontExist;
@@ -474,10 +427,6 @@ class CoreExport ServerConfig
         */
        std::string CustomVersion;
 
-       /** List of u-lined servers
-        */
-       std::map<irc::string, bool> ulines;
-
        /** If set to true, provide syntax hints for unknown commands
         */
        bool SyntaxHints;
@@ -505,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;