X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=511bedbee2618ecfb42977844d4455aed4096939;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=9349813d6cf15eaf1d61cfbbb1e4a0dcec38751b;hpb=802eed1734cf20e9a2549a5fe343d04c34e83a10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index 9349813d6..511bedbee 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -42,12 +42,16 @@ class CoreExport ConfigTag : public refcountbase const std::string src_name; const int src_line; + /** Get the value of an option, using def if it does not exist */ + std::string getString(const std::string& key, const std::string& def, const TR1NS::function& validator); /** Get the value of an option, using def if it does not exist */ std::string getString(const std::string& key, const std::string& def = "", size_t minlen = 0, size_t maxlen = UINT32_MAX); /** Get the value of an option, using def if it does not exist */ - long getInt(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX); + long getInt(const std::string& key, long def, long min = LONG_MIN, long max = LONG_MAX); + /** Get the value of an option, using def if it does not exist */ + unsigned long getUInt(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX); /** Get the value of an option, using def if it does not exist */ - double getFloat(const std::string& key, double def = 0); + double getFloat(const std::string& key, double def, double min = DBL_MIN, double max = DBL_MAX); /** Get the value of an option, using def if it does not exist */ bool getBool(const std::string& key, bool def = false); @@ -59,7 +63,7 @@ class CoreExport ConfigTag : public refcountbase * @param max Maximum acceptable value (optional) * @return The duration in seconds */ - long getDuration(const std::string& key, long def = 0, long min = LONG_MIN, long max = LONG_MAX); + unsigned long getDuration(const std::string& key, unsigned long def, unsigned long min = 0, unsigned long max = ULONG_MAX); /** Get the value of an option * @param key The option to get @@ -69,16 +73,6 @@ class CoreExport ConfigTag : public refcountbase */ bool readString(const std::string& key, std::string& value, bool allow_newline = false); - /** Check for an out of range value. If the value falls outside the boundaries a warning is - * logged and the value is corrected (set to def). - * @param key The key name, used in the warning message - * @param res The value to verify and modify if needed - * @param def The default value, res will be set to this if (min <= res <= max) doesn't hold true - * @param min Minimum accepted value for res - * @param max Maximum accepted value for res - */ - void CheckRange(const std::string& key, long& res, long def, long min, long max); - std::string getTagLocation(); inline const ConfigItems& getItems() const { return items; } @@ -109,8 +103,8 @@ class ServerLimits size_t MaxTopic; /** Maximum kick message length */ size_t MaxKick; - /** Maximum GECOS (real name) length */ - size_t MaxGecos; + /** Maximum real name length */ + size_t MaxReal; /** Maximum away message length */ size_t MaxAway; /** Maximum line length */ @@ -154,6 +148,18 @@ struct CommandLineConf */ bool writelog; + /** If this is true, a PID file will be written + * to the file given in the "file" variable of + * the \ tag in the config file. This is + * the default. + * Passing --nopid as a command line argument + * sets this to false; in this case, a PID file + * will not be written, even the default PID + * file that is usually written when the \ + * tag is not defined in the config file. + */ + bool writepid; + /** Saved argc from startup */ int argc; @@ -206,6 +212,19 @@ class CoreExport ServerConfig void CrossCheckConnectBlocks(ServerConfig* current); public: + /** How to treat a user in a channel who is banned. */ + enum BannedUserTreatment + { + /** Don't treat a banned user any different to normal. */ + BUT_NORMAL, + + /** Restrict the actions of a banned user. */ + BUT_RESTRICT_SILENT, + + /** Restrict the actions of a banned user and notify them of their treatment. */ + BUT_RESTRICT_NOTIFY + }; + class ServerPaths { public: @@ -237,11 +256,16 @@ class CoreExport ServerConfig */ typedef insp::flat_map > OperIndex; - /** Get a configuration tag - * @param tag The name of the tag to get + /** Get a configuration tag by name. If one or more tags are present then the first is returned. + * @param tag The name of the tag to get. + * @returns Either a tag from the config or EmptyTag. */ ConfigTag* ConfValue(const std::string& tag); + /** Get a list of configuration tags by name. + * @param tag The name of the tags to get. + * @returns Either a list of tags from the config or an empty ConfigTagList. + */ ConfigTagList ConfTags(const std::string& tag); /** An empty configuration tag. */ @@ -308,28 +332,8 @@ class CoreExport ServerConfig */ std::string ServerDesc; - /** Pretend disabled commands don't exist. - */ - bool DisabledDontExist; - - /** This variable identifies which usermodes have been diabled. - */ - std::bitset<64> DisabledUModes; - - /** This variable identifies which chanmodes have been disabled. - */ - std::bitset<64> DisabledCModes; - - /** If set to true, then all opers on this server are - * shown with a generic 'is an IRC operator' line rather - * than the oper type. Oper types are still used internally. - */ - bool GenericOper; - - /** If this value is true, banned users (+b, not extbans) will not be able to change nick - * if banned on any channel, nor to message them. - */ - bool RestrictBannedUsers; + /** How to treat a user in a channel who is banned. */ + BannedUserTreatment RestrictBannedUsers; /** The size of the read() buffer in the user * handling code, used to read data into a user's @@ -360,12 +364,11 @@ class CoreExport ServerConfig */ unsigned int MaxTargets; - /** True if we're going to hide netsplits as *.net *.split for non-opers - */ - bool HideSplits; + /** The number of seconds that the server clock can skip by before server operators are warned. */ + time_t TimeSkipWarn; - /** True if we're going to hide ban reasons for non-opers (e.g. G-Lines, - * K-Lines, Z-Lines) + /** True if we're going to hide ban reasons for non-opers (e.g. G-lines, + * K-lines, Z-lines) */ bool HideBans; @@ -375,14 +378,6 @@ class CoreExport ServerConfig /** Set to a non-empty string to obfuscate server names. */ std::string HideServer; - /** Set to a non empty string to obfuscate nicknames prepended to a KILL. - */ - 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. */ @@ -392,11 +387,6 @@ class CoreExport ServerConfig */ ClassVector Classes; - /** STATS characters in this list are available - * only to operators. - */ - std::string UserStats; - /** Default channel modes */ std::string DefaultModes; @@ -413,11 +403,6 @@ class CoreExport ServerConfig */ std::string CaseMapping; - /** If set to true, the CycleHosts mode change will be sourced from the user, - * rather than the server - */ - bool CycleHostsFromUser; - /** 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. */ @@ -469,9 +454,6 @@ class CoreExport ServerConfig void Fill(); - /** Disables the commands specified in . */ - bool ApplyDisabledCommands(); - /** Escapes a value for storage in a configuration key. * @param str The string to escape. * @param xml Are we using the XML config format?