X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=9b73dd3c630a095fdc5e3e59889a25e86fcff670;hb=42de16029da37f08ce1827352aa78b4b29d888cb;hp=772de2177d06307996b5f3e38c37e0a8e3a2be36;hpb=32be456c07972a289ebbf8db99b88a591e963235;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index 772de2177..9b73dd3c6 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -1,371 +1,341 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2006 Oliver Lupton * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#ifndef INSPIRCD_CONFIGREADER -#define INSPIRCD_CONFIGREADER - -/* handy defines */ -/** Determines if a channel op is exempt from given mode m, - * in config of server instance s. - */ -#define CHANOPS_EXEMPT(s, m) (s->Config->ExemptChanOps[(unsigned char)m]) +#pragma once #include #include #include #include #include "inspircd.h" -#include "globals.h" #include "modules.h" #include "socketengine.h" #include "socket.h" -class ServerConfig; -class InspIRCd; -class InspSocket; - -/** Types of data in the core config - */ -enum ConfigDataType -{ - DT_NOTHING = 0, - DT_INTEGER = 1, - DT_CHARPTR = 2, - DT_BOOLEAN = 3, - DT_ALLOW_NEWLINE = 128 -}; - -/** Holds a config value, either string, integer or boolean. - * Callback functions receive one or more of these, either on - * their own as a reference, or in a reference to a deque of them. - * The callback function can then alter the values of the ValueItem - * classes to validate the settings. - */ -class ValueItem +/** Structure representing a single \ in config */ +class CoreExport ConfigTag : public refcountbase { - std::string v; + std::vector items; public: - ValueItem(int value); - ValueItem(bool value); - ValueItem(char* value); - void Set(char* value); - void Set(const char* val); - void Set(int value); - int GetInteger(); - char* GetString(); - bool GetBool(); + const std::string tag; + 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 = ""); + /** 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); + /** Get the value of an option, using def if it does not exist */ + double getFloat(const std::string& key, double def = 0); + /** Get the value of an option, using def if it does not exist */ + bool getBool(const std::string& key, bool def = false); + + /** Get the value in seconds of a duration that is in the user-friendly "1h2m3s" format, + * using a default value if it does not exist or is out of bounds. + * @param key The config key name + * @param def Default value (optional) + * @param min Minimum acceptable value (optional) + * @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); + + /** Get the value of an option + * @param key The option to get + * @param value The location to store the value (unmodified if does not exist) + * @param allow_newline Allow newlines in the option (normally replaced with spaces) + * @return true if the option exists + */ + 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 std::vector& 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*& Items); + private: + ConfigTag(const std::string& Tag, const std::string& file, int line); }; -/** The base class of the container 'ValueContainer' - * used internally by the core to hold core values. +/** Defines the server's length limits on various length-limited + * items such as topics, nicknames, channel names etc. */ -class ValueContainerBase +class ServerLimits { public: - ValueContainerBase() { } - virtual ~ValueContainerBase() { } + /** Maximum nickname length */ + size_t NickMax; + /** Maximum channel length */ + size_t ChanMax; + /** Maximum number of modes per line */ + size_t MaxModes; + /** Maximum length of ident, not including ~ etc */ + size_t IdentMax; + /** Maximum length of a quit message */ + size_t MaxQuit; + /** Maximum topic length */ + size_t MaxTopic; + /** Maximum kick message length */ + size_t MaxKick; + /** Maximum GECOS (real name) length */ + size_t MaxGecos; + /** Maximum away message length */ + size_t MaxAway; + /** Maximum line length */ + size_t MaxLine; + /** Maximum hostname length */ + size_t MaxHost; + + /** 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(ConfigTag* tag); }; -/** ValueContainer is used to contain pointers to different - * core values such as the server name, maximum number of - * clients etc. - * It is specialized to hold a data type, then pointed at - * a value in the ServerConfig class. When the value has been - * read and validated, the Set method is called to write the - * value safely in a type-safe manner. - */ -template class ValueContainer : public ValueContainerBase +struct CommandLineConf { - T val; - - public: - - ValueContainer() - { - val = NULL; - } - - ValueContainer(T Val) - { - val = Val; - } - - void Set(T newval, size_t s) - { - memcpy(val, newval, s); - } -}; - -/** A specialization of ValueContainer to hold a pointer to a bool - */ -typedef ValueContainer ValueContainerBool; - -/** A specialization of ValueContainer to hold a pointer to - * an unsigned int - */ -typedef ValueContainer ValueContainerUInt; - -/** A specialization of ValueContainer to hold a pointer to - * a char array. - */ -typedef ValueContainer ValueContainerChar; + /** If this value is true, the owner of the + * server specified -nofork on the command + * line, causing the daemon to stay in the + * foreground. + */ + bool nofork; -/** A specialization of ValueContainer to hold a pointer to - * an int - */ -typedef ValueContainer ValueContainerInt; + /** If this value if true then all log + * messages will be output, regardless of + * the level given in the config file. + * This is set with the -debug commandline + * option. + */ + bool forcedebug; -/** A set of ValueItems used by multi-value validator functions - */ -typedef std::deque ValueList; + /** If this is true then log output will be + * written to the logfile. This is the default. + * If you put -nolog on the commandline then + * the logfile will not be written. + * This is meant to be used in conjunction with + * -debug for debugging without filling up the + * hard disk. + */ + bool writelog; -/** A callback for validating a single value - */ -typedef bool (*Validator)(ServerConfig* conf, const char*, const char*, ValueItem&); -/** A callback for validating multiple value entries - */ -typedef bool (*MultiValidator)(ServerConfig* conf, const char*, char**, ValueList&, int*); -/** A callback indicating the end of a group of entries - */ -typedef bool (*MultiNotify)(ServerConfig* conf, const char*); + /** Saved argc from startup + */ + int argc; -/** Holds a core configuration item and its callbacks - */ -struct InitialConfig -{ - char* tag; - char* value; - char* default_value; - ValueContainerBase* val; - ConfigDataType datatype; - Validator validation_function; + /** Saved argv from startup + */ + char** argv; }; -/** Holds a core configuration item and its callbacks - * where there may be more than one item - */ -struct MultiConfig +class CoreExport OperInfo : public refcountbase { - const char* tag; - char* items[13]; - char* items_default[13]; - int datatype[13]; - MultiNotify init_function; - MultiValidator validation_function; - MultiNotify finish_function; + public: + typedef insp::flat_set PrivSet; + PrivSet AllowedOperCommands; + PrivSet AllowedPrivs; + + /** Allowed user modes from oper classes. */ + std::bitset<64> AllowedUserModes; + + /** Allowed channel modes from oper classes. */ + std::bitset<64> AllowedChanModes; + + /** \ block used for this oper-up. May be NULL. */ + reference oper_block; + /** \ block used for this oper-up. Valid for local users, may be NULL on remote */ + reference type_block; + /** \ blocks referenced from the \ block. These define individual permissions */ + std::vector > class_blocks; + /** Name of the oper type; i.e. the one shown in WHOIS */ + std::string name; + + /** Get a configuration item, searching in the oper, type, and class blocks (in that order) */ + std::string getConfig(const std::string& key); + void init(); }; -/** A set of oper types - */ -typedef std::map opertype_t; - -/** A Set of oper classes - */ -typedef std::map operclass_t; - - /** This class holds the bulk of the runtime configuration for the ircd. * It allows for reading new config values, accessing configuration files, * and storage of the configuration data needed to run the ircd, such as * the servername, connect classes, /ADMIN data, MOTDs and filenames etc. */ -class ServerConfig : public Extensible +class CoreExport ServerConfig { private: - /** Creator/owner - */ - InspIRCd* ServerInstance; + void CrossCheckOperClassType(); + void CrossCheckConnectBlocks(ServerConfig* current); - /** This variable holds the names of all - * files included from the main one. This - * is used to make sure that no files are - * recursively included. - */ - std::vector include_stack; + public: + class ServerPaths + { + public: + /** Config path */ + std::string Config; - /** This private method processes one line of - * configutation, appending errors to errorstream - * and setting error if an error has occured. - */ - bool ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream); - - /** Process an include directive - */ - bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); + /** Data path */ + std::string Data; - /** Check that there is only one of each configuration item - */ - bool CheckOnce(char* tag, bool bail, userrec* user); - - public: + /** Log path */ + std::string Log; - InspIRCd* GetInstance(); - - /** This holds all the information in the config file, - * it's indexed by tag name to a vector of key/values. - */ - ConfigDataHash config_data; + /** Module path */ + std::string Module; - /** Max number of WhoWas entries per user. - */ - int WhoWasGroupSize; + ServerPaths() + : Config(INSPIRCD_CONFIG_PATH) + , Data(INSPIRCD_DATA_PATH) + , Log(INSPIRCD_LOG_PATH) + , Module(INSPIRCD_MODULE_PATH) { } - /** Max number of cumulative user-entries in WhoWas. - * When max reached and added to, push out oldest entry FIFO style. - */ - int WhoWasMaxGroups; + 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); } + std::string PrependLog(const std::string& fn) const { return FileSystem::ExpandPath(Log, fn); } + std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); } + }; - /** Max seconds a user is kept in WhoWas before being pruned. + /** Holds a complete list of all connect blocks */ - int WhoWasMaxKeep; + typedef std::vector > ClassVector; - /** Holds the server name of the local server - * as defined by the administrator. + /** Index of valid oper blocks and types */ - char ServerName[MAXBUF]; - - /* Holds the network name the local server - * belongs to. This is an arbitary field defined - * by the administrator. - */ - char Network[MAXBUF]; + typedef insp::flat_map > OperIndex; - /** Holds the description of the local server - * as defined by the administrator. + /** Get a configuration tag + * @param tag The name of the tag to get */ - char ServerDesc[MAXBUF]; + ConfigTag* ConfValue(const std::string& tag); - /** Holds the admin's name, for output in - * the /ADMIN command. - */ - char AdminName[MAXBUF]; + ConfigTagList ConfTags(const std::string& tag); - /** Holds the email address of the admin, - * for output in the /ADMIN command. - */ - char AdminEmail[MAXBUF]; + /** An empty configuration tag. */ + ConfigTag* EmptyTag; - /** Holds the admin's nickname, for output - * in the /ADMIN command + /** Error stream, contains error output from any failed configuration parsing. */ - char AdminNick[MAXBUF]; + std::stringstream errstr; - /** The admin-configured /DIE password - */ - char diepass[MAXBUF]; + /** True if this configuration is valid enough to run with */ + bool valid; - /** The admin-configured /RESTART password - */ - char restartpass[MAXBUF]; + /** Bind to IPv6 by default */ + bool WildcardIPv6; - /** The pathname and filename of the message of the - * day file, as defined by the administrator. - */ - char motd[MAXBUF]; + /** Used to indicate who we announce invites to on a channel */ + enum InviteAnnounceState { INVITE_ANNOUNCE_NONE, INVITE_ANNOUNCE_ALL, INVITE_ANNOUNCE_OPS, INVITE_ANNOUNCE_DYNAMIC }; + enum OperSpyWhoisState { SPYWHOIS_NONE, SPYWHOIS_SINGLEMSG, SPYWHOIS_SPLITMSG }; - /** The pathname and filename of the rules file, - * as defined by the administrator. + /** This holds all the information in the config file, + * it's indexed by tag name to a vector of key/values. */ - char rules[MAXBUF]; + ConfigDataHash config_data; - /** The quit prefix in use, or an empty string + /** This holds all extra files that have been read in the configuration + * (for example, MOTD and RULES files are stored here) */ - char PrefixQuit[MAXBUF]; + ConfigFileCache Files; - /** The quit suffix in use, or an empty string + /** Length limits, see definition of ServerLimits class */ - char SuffixQuit[MAXBUF]; + ServerLimits Limits; + + /** Locations of various types of file (config, module, etc). */ + ServerPaths Paths; - /** The fixed quit message in use, or an empty string + /** Configuration parsed from the command line. */ - char FixedQuit[MAXBUF]; + CommandLineConf cmdline; - /** The last string found within a tag, or - * an empty string. + /** Clones CIDR range for ipv4 (0-32) + * Defaults to 32 (checks clones on all IPs seperately) */ - char DieValue[MAXBUF]; + int c_ipv4_range; - /** The DNS server to use for DNS queries + /** Clones CIDR range for ipv6 (0-128) + * Defaults to 128 (checks on all IPs seperately) */ - char DNSServer[MAXBUF]; + int c_ipv6_range; - /** This variable contains a space-seperated list - * of commands which are disabled by the - * administrator of the server for non-opers. + /** Holds the server name of the local server + * as defined by the administrator. */ - char DisabledCommands[MAXBUF]; + std::string ServerName; - /** The full path to the modules directory. - * This is either set at compile time, or - * overridden in the configuration file via - * the tag. + /** Notice to give to users when they are banned by an XLine */ - char ModPath[1024]; + std::string XLineMessage; - /** The full pathname to the executable, as - * given in argv[0] when the program starts. + /* Holds the network name the local server + * belongs to. This is an arbitary field defined + * by the administrator. */ - char MyExecutable[1024]; + std::string Network; - /** The file handle of the logfile. If this - * value is NULL, the log file is not open, - * probably due to a permissions error on - * startup (this should not happen in normal - * operation!). + /** Holds the description of the local server + * as defined by the administrator. */ - FILE *log_file; + std::string ServerDesc; - /** If this value is true, the owner of the - * server specified -nofork on the command - * line, causing the daemon to stay in the - * foreground. + /** Pretend disabled commands don't exist. */ - bool nofork; - - /** If this value if true then all log - * messages will be output, regardless of - * the level given in the config file. - * This is set with the -debug commandline - * option. + bool DisabledDontExist; + + /** This variable contains a space-seperated list + * of commands which are disabled by the + * administrator of the server for non-opers. */ - bool forcedebug; - - /** If this is true then log output will be - * written to the logfile. This is the default. - * If you put -nolog on the commandline then - * the logfile will not be written. - * This is meant to be used in conjunction with - * -debug for debugging without filling up the - * hard disk. + std::string DisabledCommands; + + /** This variable identifies which usermodes have been diabled. */ - bool writelog; + char DisabledUModes[64]; - /** If this value is true, halfops have been - * enabled in the configuration file. + /** This variable identifies which chanmodes have been disabled. */ - bool AllowHalfop; + char DisabledCModes[64]; - /** If this is set to true, then mode lists (e.g - * MODE #chan b) are hidden from unprivileged - * users. + /** 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 HideModeLists[256]; + bool GenericOper; - /** If this is set to true, then channel operators - * are exempt from this channel mode. Used for +Sc etc. + /** 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 ExemptChanOps[256]; + bool RestrictBannedUsers; /** The number of seconds the DNS subsystem * will wait before timing out any request. @@ -383,6 +353,13 @@ class ServerConfig : public Extensible */ int MaxConn; + /** If we should check for clones during CheckClass() in AddUser() + * Setting this to false allows to not trigger on maxclones for users + * that may belong to another class after DNS-lookup is complete. + * It does, however, make the server spend more time on users we may potentially not want. + */ + bool CCOnConnect; + /** The soft limit value assigned to the irc server. * The IRC server will not allow more than this * number of local users. @@ -394,24 +371,6 @@ class ServerConfig : public Extensible */ unsigned int MaxTargets; - /** The maximum number of /WHO results allowed - * in any single /WHO command. - */ - int MaxWhoResults; - - /** True if the DEBUG loglevel is selected. - */ - int debugging; - - /** The loglevel in use by the IRC server - */ - int LogLevel; - - /** How many seconds to wait before exiting - * the program when /DIE is correctly issued. - */ - int DieDelay; - /** True if we're going to hide netsplits as *.net *.split for non-opers */ bool HideSplits; @@ -423,252 +382,156 @@ class ServerConfig : public Extensible /** Announce invites to the channel with a server notice */ - bool AnnounceInvites; + InviteAnnounceState AnnounceInvites; /** If this is enabled then operators will * see invisible (+i) channels in /whois. */ - bool OperSpyWhois; + OperSpyWhoisState OperSpyWhois; + + /** True if raw I/O is being logged */ + bool RawLog; /** Set to a non-empty string to obfuscate the server name of users in WHOIS */ - char HideWhoisServer[MAXBUF]; + std::string HideWhoisServer; /** Set to a non empty string to obfuscate nicknames prepended to a KILL. */ - char HideKillsServer[MAXBUF]; - - /** The MOTD file, cached in a file_cache type. - */ - file_cache MOTD; - - /** The RULES file, cached in a file_cache type. - */ - file_cache RULES; + std::string HideKillsServer; /** The full pathname and filename of the PID * file as defined in the configuration. */ - char PID[1024]; + std::string PID; /** The connect classes in use by the IRC server. */ ClassVector Classes; - /** A list of module names (names only, no paths) - * which are currently loaded by the server. - */ - std::vector module_names; - - /** A list of the classes for listening client ports - */ - std::vector ports; - - /** Boolean sets of which modules implement which functions - */ - char implement_lists[255][255]; - - /** Global implementation list - */ - char global_implementation[255]; - - /** A list of ports claimed by IO Modules - */ - std::map IOHookModule; - - std::map SocketIOHookModule; - - /** The 005 tokens of this server (ISUPPORT) - * populated/repopulated upon loading or unloading - * modules. - */ - std::string data005; - std::vector isupport; - /** STATS characters in this list are available * only to operators. */ - char UserStats[MAXBUF]; - - /** The path and filename of the ircd.log file - */ - std::string logpath; - - /** Custom version string, which if defined can replace the system info in VERSION. - */ - char CustomVersion[MAXBUF]; - - /** List of u-lined servers - */ - std::map ulines; - - /** Max banlist sizes for channels (the std::string is a glob) - */ - std::map maxbans; + std::string UserStats; - /** Directory where the inspircd binary resides + /** Default channel modes */ - std::string MyDir; + std::string DefaultModes; - /** If set to true, no user DNS lookups are to be performed + /** Custom version string, which if defined can replace the system info in VERSION. */ - bool NoUserDns; + std::string CustomVersion; /** If set to true, provide syntax hints for unknown commands */ bool SyntaxHints; - /** If set to true, users appear to quit then rejoin when their hosts change. - * This keeps clients synchronized properly. + /** If set to true, the CycleHosts mode change will be sourced from the user, + * rather than the server */ - bool CycleHosts; + 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 + /** 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. */ bool FullHostInTopic; - /** All oper type definitions from the config file + /** Oper blocks keyed by their name */ - opertype_t opertypes; + OperIndex oper_blocks; - /** All oper class definitions from the config file + /** Oper types keyed by their name */ - operclass_t operclass; + OperIndex OperTypes; - /** Saved argv from startup - */ - char** argv; - - /** Saved argc from startup - */ - int argc; - - /** Max channels per user + /** Default value for , deprecated in 2.2 */ unsigned int MaxChans; - /** Oper max channels per user + /** Default value for , deprecated in 2.2 */ unsigned int OperMaxChans; - /** Construct a new ServerConfig + /** TS6-like server ID. + * NOTE: 000...999 are usable for InspIRCd servers. This + * makes code simpler. 0AA, 1BB etc with letters are reserved + * for services use. */ - ServerConfig(InspIRCd* Instance); + std::string sid; - /** Clears the include stack in preperation for a Read() call. + /** Construct a new ServerConfig */ - void ClearStack(); + ServerConfig(); - /** Update the 005 vector - */ - void Update005(); + ~ServerConfig(); - /** Send the 005 numerics (ISUPPORT) to a user + /** Get server ID as string with required leading zeroes */ - void Send005(userrec* user); + const std::string& GetSID() const { return sid; } /** Read the entire configuration into memory * and initialize this class. All other methods * should be used only by the core. */ - void Read(bool bail, userrec* user); + void Read(); - /** Read a file into a file_cache object + /** Apply configuration changes from the old configuration. */ - bool ReadFile(file_cache &F, const char* fname); + void Apply(ServerConfig* old, const std::string &useruid); + void ApplyModules(User* user); - /** Load 'filename' into 'target', with the new config parser everything is parsed into - * tag/key/value at load-time rather than at read-value time. - */ + void Fill(); - /** Report a configuration error given in errormessage. - * @param bail If this is set to true, the error is sent to the console, and the program exits - * @param user If this is set to a non-null value, and bail is false, the errors are spooled to - * this user as SNOTICEs. - * If the parameter is NULL, the messages are spooled to all users via WriteOpers as SNOTICEs. - */ - void ReportConfigError(const std::string &errormessage, bool bail, userrec* user); + bool ApplyDisabledCommands(const std::string& data); - /** Load 'filename' into 'target', with the new config parser everything is parsed into - * tag/key/value at load-time rather than at read-value time. + /** Escapes a value for storage in a configuration key. + * @param str The string to escape. + * @param xml Are we using the XML config format? */ - bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream); + static std::string Escape(const std::string& str, bool xml = true); - /** Load 'filename' into 'target', with the new config parser everything is parsed into - * tag/key/value at load-time rather than at read-value time. - */ - bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream); - - /* Both these return true if the value existed or false otherwise */ - - /** Writes 'length' chars into 'result' as a string + /** If this value is true, snotices will not stack when repeats are sent */ - bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds = false); - bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, char* result, int length, bool allow_linefeeds = false); + bool NoSnoticeStack; +}; - /** Writes 'length' chars into 'result' as a string - */ - bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, std::string &result, bool allow_linefeeds = false); - bool ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds = false); - - /** Tries to convert the value to an integer and write it to 'result' - */ - bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, int index, int &result); - bool ConfValueInteger(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index, int &result); - /** Tries to convert the value to an integer and write it to 'result' - */ - bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, int index, int &result); - bool ConfValueInteger(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, int &result); - - /** Returns true if the value exists and has a true value, false otherwise - */ - bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, int index); - bool ConfValueBool(ConfigDataHash &target, const char* tag, const char* var, const char* default_value, int index); - /** Returns true if the value exists and has a true value, false otherwise - */ - bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, int index); - bool ConfValueBool(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index); - - /** Returns the number of occurences of tag in the config file - */ - int ConfValueEnum(ConfigDataHash &target, const char* tag); - /** Returns the number of occurences of tag in the config file - */ - int ConfValueEnum(ConfigDataHash &target, const std::string &tag); - - /** Returns the numbers of vars inside the index'th 'tag in the config file - */ - int ConfVarEnum(ConfigDataHash &target, const char* tag, int index); - /** Returns the numbers of vars inside the index'th 'tag in the config file - */ - int ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index); - - Module* GetIOHook(int port); - bool AddIOHook(int port, Module* iomod); - bool DelIOHook(int port); - Module* GetIOHook(InspSocket* is); - bool AddIOHook(Module* iomod, InspSocket* is); - bool DelIOHook(InspSocket* is); +/** The background thread for config reading, so that reading from executable includes + * does not block. + */ +class CoreExport ConfigReaderThread : public Thread +{ + ServerConfig* Config; + volatile bool done; + public: + const std::string TheUserUID; + ConfigReaderThread(const std::string &useruid) + : Config(new ServerConfig), done(false), TheUserUID(useruid) + { + } - static std::string GetFullProgDir(char** argv, int argc); - static bool DirValid(const char* dirandfile); - static char* CleanFilename(char* name); - static bool FileExists(const char* file); - -}; + virtual ~ConfigReaderThread() + { + delete Config; + } -bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance); + void Run(); + /** Run in the main thread to apply the configuration */ + void Finish(); + bool IsDone() { return done; } +}; -bool InitTypes(ServerConfig* conf, const char* tag); -bool InitClasses(ServerConfig* conf, const char* tag); -bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); -bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); -bool DoneClassesAndTypes(ServerConfig* conf, const char* tag); +class CoreExport ConfigStatus +{ + public: + User* const srcuser; -#endif + ConfigStatus(User* user = NULL) + : srcuser(user) + { + } +};