X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=7fc60203d9116b736798206744722a35b648c74d;hb=2695c489cc908ca43b49ea4428a259af781ed952;hp=e74895e8bd1315d555f68a3e7c2353c373f3e70a;hpb=bfaf7e3b27981a5144faba6d17c6e29fac735dbb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index e74895e8b..7fc60203d 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -49,9 +49,14 @@ enum ConfigDataType DT_IPADDRESS = 6, /* IP address (v4, v6) */ DT_CHANNEL = 7, /* Channel name */ DT_ALLOW_WILD = 64, /* Allow wildcards/CIDR in DT_IPADDRESS */ - DT_ALLOW_NEWLINE = 128 /* New line characters allowed in DT_CHARPTR */ + DT_ALLOW_NEWLINE = 128, /* New line characters allowed in DT_CHARPTR */ + 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. @@ -172,11 +177,18 @@ struct InitialConfig /** Value containers */ ValueContainerBase* val; /** Data types */ - ConfigDataType datatype; + int datatype; /** Validation function */ 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 */ @@ -185,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 */ @@ -202,9 +214,16 @@ struct MultiConfig */ typedef std::map opertype_t; +struct operclass_data : public Extensible +{ + char* commandlist; + char* cmodelist; + char* umodelist; +}; + /** A Set of oper classes */ -typedef std::map operclass_t; +typedef std::map operclass_t; /** This class holds the bulk of the runtime configuration for the ircd. @@ -230,18 +249,26 @@ class CoreExport ServerConfig : public Extensible * 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, int pass, std::istream* scan_for_includes_only); - - /** Process an include directive - */ - bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only); + bool ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream); /** Check that there is only one of each configuration item */ - bool CheckOnce(const char* tag); + bool CheckOnce(const char* tag, ConfigDataHash &newconf); public: + /** Process an include executable directive + */ + bool DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); + + /** Process an include file directive + */ + bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream); + + User* RehashUser; + + std::string RehashParameter; + std::ostringstream errstr; ConfigDataHash newconfig; @@ -261,7 +288,7 @@ class CoreExport ServerConfig : public Extensible InspIRCd* GetInstance(); - void DoDownloads(); + int DoDownloads(); /** This holds all the information in the config file, * it's indexed by tag name to a vector of key/values. @@ -474,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. */ @@ -530,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) @@ -629,6 +650,11 @@ class CoreExport ServerConfig : public Extensible */ char sid[MAXBUF]; + /** True if we have been told to run the testsuite from the commandline, + * rather than entering the mainloop. + */ + bool TestSuite; + /** Construct a new ServerConfig */ ServerConfig(InspIRCd* Instance); @@ -653,12 +679,16 @@ class CoreExport ServerConfig : public Extensible * and initialize this class. All other methods * should be used only by the core. */ - void Read(bool bail, User* user, int pass); + void Read(bool bail, User* user); /** Read a file into a file_cache object */ 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 @@ -670,12 +700,12 @@ class CoreExport ServerConfig : public Extensible /** 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, int pass, std::istream* scan_for_includs_only); + bool LoadConf(ConfigDataHash &target, FILE* &conf, 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. */ - bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only = NULL); + bool LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream); /* Both these return true if the value existed or false otherwise */ @@ -738,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