X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=c4275ab5f03eebbb3b2a16511705bfa0a5c8ad56;hb=3ec7995bf4981119115d14ce2cfce0cb5795f803;hp=069e6321d4c80d8afdcaf1b7bb7c714597712c22;hpb=893242cff9a2efc3d7d6553a0b96c83c1033b638;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index 069e6321d..c4275ab5f 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -2,13 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * @@ -30,79 +26,58 @@ class ServerConfig; class InspIRCd; +class InspSocket; /** Types of data in the core config */ -enum ConfigDataType { DT_NOTHING, DT_INTEGER, DT_CHARPTR, DT_BOOLEAN }; +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 { std::string v; public: - ValueItem(int value) - { - std::stringstream n; - n << value; - v = n.str(); - } - - ValueItem(bool value) - { - std::stringstream n; - n << value; - v = n.str(); - } - - ValueItem(char* value) - { - v = value; - } - - void Set(char* value) - { - v = value; - } - - void Set(const char* value) - { - v = value; - } - - void Set(int value) - { - std::stringstream n; - n << value; - v = n.str(); - } - - int GetInteger() - { - return atoi(v.c_str()); - } - - char* GetString() - { - return (char*)v.c_str(); - } - - bool GetBool() - { - return (GetInteger() || v == "yes" || v == "true"); - } + 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(); }; +/** The base class of the container 'ValueContainer' + * used internally by the core to hold core values. + */ class ValueContainerBase { public: - ValueContainerBase() - { - } - - virtual ~ValueContainerBase() - { - } + ValueContainerBase() { } + virtual ~ValueContainerBase() { } }; +/** 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 { T val; @@ -125,11 +100,27 @@ template class ValueContainer : public ValueContainerBase } }; +/** 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; + +/** A specialization of ValueContainer to hold a pointer to + * an int + */ typedef ValueContainer ValueContainerInt; +/** A set of ValueItems used by multi-value validator functions + */ typedef std::deque ValueList; /** A callback for validating a single value @@ -142,13 +133,13 @@ typedef bool (*MultiValidator)(ServerConfig* conf, const char*, char**, ValueLis */ typedef bool (*MultiNotify)(ServerConfig* conf, const char*); - /** Holds a core configuration item and its callbacks */ struct InitialConfig { char* tag; char* value; + char* default_value; ValueContainerBase* val; ConfigDataType datatype; Validator validation_function; @@ -159,9 +150,10 @@ struct InitialConfig */ struct MultiConfig { - const char* tag; - char* items[12]; - int datatype[12]; + const char* tag; + char* items[13]; + char* items_default[13]; + int datatype[13]; MultiNotify init_function; MultiValidator validation_function; MultiNotify finish_function; @@ -284,6 +276,14 @@ class ServerConfig : public Extensible */ char PrefixQuit[MAXBUF]; + /** The quit suffix in use, or an empty string + */ + char SuffixQuit[MAXBUF]; + + /** The fixed quit message in use, or an empty string + */ + char FixedQuit[MAXBUF]; + /** The last string found within a tag, or * an empty string. */ @@ -306,10 +306,6 @@ class ServerConfig : public Extensible */ char ModPath[1024]; - /** The temporary directory where modules are copied - */ - char TempDir[1024]; - /** The full pathname to the executable, as * given in argv[0] when the program starts. */ @@ -353,6 +349,12 @@ class ServerConfig : public Extensible */ bool AllowHalfop; + /** 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. */ @@ -407,6 +409,10 @@ class ServerConfig : public Extensible */ bool HideBans; + /** Announce invites to the channel with a server notice + */ + bool AnnounceInvites; + /** If this is enabled then operators will * see invisible (+i) channels in /whois. */ @@ -463,11 +469,14 @@ class ServerConfig : public Extensible */ 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. @@ -484,12 +493,16 @@ class ServerConfig : public Extensible /** List of u-lined servers */ - std::vector ulines; + std::map ulines; /** Max banlist sizes for channels (the std::string is a glob) */ std::map maxbans; + /** Directory where the inspircd binary resides + */ + std::string MyDir; + /** If set to true, no user DNS lookups are to be performed */ bool NoUserDns; @@ -503,6 +516,16 @@ class ServerConfig : public Extensible */ bool CycleHosts; + /** 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. + */ + bool FullHostInTopic; + /** All oper type definitions from the config file */ opertype_t opertypes; @@ -511,6 +534,22 @@ class ServerConfig : public Extensible */ operclass_t operclass; + /** Saved argv from startup + */ + char** argv; + + /** Saved argc from startup + */ + int argc; + + /** Max channels per user + */ + unsigned int MaxChans; + + /** Oper max channels per user + */ + unsigned int OperMaxChans; + /** Construct a new ServerConfig */ ServerConfig(InspIRCd* Instance); @@ -519,6 +558,14 @@ class ServerConfig : public Extensible */ void ClearStack(); + /** Update the 005 vector + */ + void Update005(); + + /** Send the 005 numerics (ISUPPORT) to a user + */ + void Send005(userrec* user); + /** Read the entire configuration into memory * and initialize this class. All other methods * should be used only by the core. @@ -529,10 +576,23 @@ class ServerConfig : public Extensible */ bool ReadFile(file_cache &F, const char* fname); + /** 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. + */ + + /** 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); + /** 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 char* filename, std::ostringstream &errorstream); + /** 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. */ @@ -542,24 +602,31 @@ class ServerConfig : public Extensible /** Writes 'length' chars into 'result' as a string */ - bool ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length); + 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); + /** 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 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 */ @@ -578,6 +645,9 @@ class ServerConfig : public Extensible 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); static std::string GetFullProgDir(char** argv, int argc); static bool DirValid(const char* dirandfile);