Merge insp20

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

diff --git a/include/configreader.h b/include/configreader.h
index f3137ec0a982d1320be1856de07d62fd29e3c0f0..fb93adafd65383d11b01c1dd01c5979c5552e230 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -117,13 +117,13 @@ class ServerLimits
        /** 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), MaxHost(64) { }
+       ServerLimits(ConfigTag* tag);
+
+       /** Maximum length of a n!u@h mask */
+       size_t GetMaxMask() const { return NickMax + 1 + IdentMax + 1 + MaxHost; }
 };
 
 struct CommandLineConf
@@ -165,8 +165,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;
@@ -233,7 +234,7 @@ class CoreExport ServerConfig
 
        /** Index of valid oper blocks and types
         */
-       typedef std::map<std::string, reference<OperInfo> > OperIndex;
+       typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex;
 
        /** Get a configuration tag
         * @param tag The name of the tag to get
@@ -242,6 +243,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;
@@ -336,12 +340,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.
         */
@@ -405,6 +403,10 @@ class CoreExport ServerConfig
         */
        std::string HideKillsServer;
 
+       /** Set to hide kills from clients of ulined servers in snotices.
+        */
+       bool HideULineKills;
+
        /** The full pathname and filename of the PID
         * file as defined in the configuration.
         */
@@ -436,11 +438,6 @@ class CoreExport ServerConfig
         */
        bool CycleHostsFromUser;
 
-       /** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix
-        *  added to the outgoing text for undernet style msg prefixing.
-        */
-       bool UndernetMsgPrefix;
-
        /** If set to true, the full nick!user\@host will be shown in the TOPIC command
         * for who set the topic last. If false, only the nick is shown.
         */
@@ -473,6 +470,8 @@ class CoreExport ServerConfig
         */
        ServerConfig();
 
+       ~ServerConfig();
+
        /** Get server ID as string with required leading zeroes
         */
        const std::string& GetSID() const { return sid; }
@@ -498,10 +497,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;