diff options
Diffstat (limited to 'include/configreader.h')
| -rw-r--r-- | include/configreader.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/configreader.h b/include/configreader.h index 342743991..57d7ab069 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -117,13 +117,10 @@ 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); }; struct CommandLineConf @@ -165,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; @@ -233,7 +231,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 |