Implement Command::RegisterService()

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

diff --git a/include/configreader.h b/include/configreader.h
index fd6452b31bed41f5eb082c061c154dc4d2e06186..9b73dd3c630a095fdc5e3e59889a25e86fcff670 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -114,14 +114,13 @@ 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
-        * from the config will change these values.
+       /** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
+        * @param tag Configuration tag to read the limits from
         */
-       ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
-               MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-               MaxLine(512) { }
+       ServerLimits(ConfigTag* tag);
 };
 
 struct CommandLineConf
@@ -163,8 +162,9 @@ struct CommandLineConf
 class CoreExport OperInfo : public refcountbase
 {
  public:
-       std::set<std::string> AllowedOperCommands;
-       std::set<std::string> AllowedPrivs;
+       typedef insp::flat_set<std::string> PrivSet;
+       PrivSet AllowedOperCommands;
+       PrivSet AllowedPrivs;
 
        /** Allowed user modes from oper classes. */
        std::bitset<64> AllowedUserModes;
@@ -214,10 +214,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 +225,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 insp::flat_map<std::string, reference<OperInfo> > OperIndex;
+
        /** Get a configuration tag
         * @param tag The name of the tag to get
         */
@@ -232,6 +240,9 @@ class CoreExport ServerConfig
 
        ConfigTagList ConfTags(const std::string& tag);
 
+       /** An empty configuration tag. */
+       ConfigTag* EmptyTag;
+
        /** Error stream, contains error output from any failed configuration parsing.
         */
        std::stringstream errstr;
@@ -297,21 +308,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;
-
        /** Pretend disabled commands don't exist.
         */
        bool DisabledDontExist;
@@ -341,12 +337,6 @@ class CoreExport ServerConfig
         */
        bool RestrictBannedUsers;
 
-       /** If this is set to true, then mode lists (e.g
-        * MODE \#chan b) are hidden from unprivileged
-        * users.
-        */
-       bool HideModeLists[256];
-
        /** The number of seconds the DNS subsystem
         * will wait before timing out any request.
         */
@@ -459,11 +449,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;
 
@@ -478,6 +468,8 @@ class CoreExport ServerConfig
         */
        ServerConfig();
 
+       ~ServerConfig();
+
        /** Get server ID as string with required leading zeroes
         */
        const std::string& GetSID() const { return sid; }
@@ -503,10 +495,6 @@ class CoreExport ServerConfig
         */
        static std::string Escape(const std::string& str, bool xml = true);
 
-       /** If this value is true, invites will bypass more than just +i
-        */
-       bool InvBypassModes;
-
        /** If this value is true, snotices will not stack when repeats are sent
         */
        bool NoSnoticeStack;