X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=7fc60203d9116b736798206744722a35b648c74d;hb=2695c489cc908ca43b49ea4428a259af781ed952;hp=b94687b43d4b40b3a1217e8c770f91e7ad7f6017;hpb=743c10e4ca5acd45e670b335a07b5bf3ab754ab6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index b94687b43..7fc60203d 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -53,6 +53,10 @@ enum ConfigDataType DT_BOOTONLY = 256 /* Can only be set on startup, not on rehash */ }; +/** The maximum number of values in a core configuration tag. Can be increased if needed. + */ +#define MAX_VALUES_PER_TAG 18 + /** 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. @@ -178,6 +182,13 @@ struct InitialConfig Validator validation_function; }; +struct Deprecated +{ + const char* tag; + const char* value; + const char* reason; +}; + /** Holds a core configuration item and its callbacks * where there may be more than one item */ @@ -186,11 +197,11 @@ struct MultiConfig /** Tag name */ const char* tag; /** One or more items within tag */ - const char* items[18]; + const char* items[MAX_VALUES_PER_TAG]; /** One or more defaults for items within tags */ - const char* items_default[18]; + const char* items_default[MAX_VALUES_PER_TAG]; /** One or more data types */ - int datatype[18]; + int datatype[MAX_VALUES_PER_TAG]; /** Initialization function */ MultiNotify init_function; /** Validation function */ @@ -203,7 +214,7 @@ struct MultiConfig */ typedef std::map opertype_t; -struct operclass_data +struct operclass_data : public Extensible { char* commandlist; char* cmodelist; @@ -242,7 +253,7 @@ class CoreExport ServerConfig : public Extensible /** Check that there is only one of each configuration item */ - bool CheckOnce(const char* tag); + bool CheckOnce(const char* tag, ConfigDataHash &newconf); public: @@ -490,10 +501,6 @@ class CoreExport ServerConfig : public Extensible */ 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. */ @@ -546,10 +553,8 @@ class CoreExport ServerConfig : public Extensible */ std::vector ports; - /** A list of ports claimed by IO Modules + /** socket objects that are attached to by modules */ - std::map IOHookModule; - std::map SocketIOHookModule; /** The 005 tokens of this server (ISUPPORT) @@ -680,6 +685,10 @@ class CoreExport ServerConfig : public Extensible */ bool ReadFile(file_cache &F, const char* fname); + /* Returns true if the given string starts with a windows drive letter + */ + bool StartsWithWindowsDriveLetter(const std::string &path); + /** 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 @@ -759,27 +768,7 @@ class CoreExport ServerConfig : public Extensible void ValidateIP(const char* p, const std::string &tag, const std::string &val, bool wild); void ValidateNoSpaces(const char* p, const std::string &tag, const std::string &val); - - /** Get a pointer to the module which has hooked the given port. - * @parameter port Port number - * @return Returns a pointer to the hooking module, or NULL - */ - Module* GetIOHook(int port); - /** Hook a module to a client port, so that it can receive notifications - * of low-level port activity. - * @param port The port number - * @param Module the module to hook to the port - * @return True if the hook was successful. - */ - bool AddIOHook(int port, Module* iomod); - - /** Delete a module hook from a client port. - * @param port The port to detatch from - * @return True if successful - */ - bool DelIOHook(int port); - /** Get a pointer to the module which has hooked the given BufferedSocket class. * @parameter port Port number * @return Returns a pointer to the hooking module, or NULL