X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=fb187048b3f6a2030af6a96bf45ceebde33a212b;hb=db90a4e900119da63316eeaa184da04f51bb7c6f;hp=8b031012d43f728453d33f70d4d6fe08aa369264;hpb=f83322c93800a528cf74811523ed90560092b715;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/configreader.h b/include/configreader.h index 8b031012d..fb187048b 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -34,7 +34,7 @@ /* Required forward definitions */ class ServerConfig; class InspIRCd; -class InspSocket; +class BufferedSocket; /** Types of data in the core config */ @@ -44,7 +44,12 @@ enum ConfigDataType DT_INTEGER = 1, /* Integer */ DT_CHARPTR = 2, /* Char pointer */ DT_BOOLEAN = 3, /* Boolean */ - DT_ALLOW_NEWLINE = 128 /* New line characters allowed */ + DT_HOSTNAME = 4, /* Hostname syntax */ + DT_NOSPACES = 5, /* No spaces */ + 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 */ }; /** Holds a config value, either string, integer or boolean. @@ -182,11 +187,11 @@ struct MultiConfig /** Tag name */ const char* tag; /** One or more items within tag */ - char* items[17]; + char* items[18]; /** One or more defaults for items within tags */ - char* items_default[17]; + char* items_default[18]; /** One or more data types */ - int datatype[17]; + int datatype[18]; /** Initialization function */ MultiNotify init_function; /** Validation function */ @@ -227,17 +232,28 @@ 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); + 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); + bool DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only); /** Check that there is only one of each configuration item */ - bool CheckOnce(char* tag, bool bail, userrec* user); - - public: + bool CheckOnce(char* tag); + + public: + + std::ostringstream errstr; + + ConfigDataHash newconfig; + + std::map IncludedFiles; + + std::map CompletedFiles; + + size_t TotalDownloaded; + size_t FileErrors; /** 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 }; @@ -246,6 +262,8 @@ class CoreExport ServerConfig : public Extensible Validator DNSServerValidator; InspIRCd* GetInstance(); + + void DoDownloads(); /** This holds all the information in the config file, * it's indexed by tag name to a vector of key/values. @@ -308,6 +326,10 @@ class CoreExport ServerConfig : public Extensible */ char restartpass[MAXBUF]; + /** The hash method for *BOTH* the die and restart passwords. + */ + char powerhash[MAXBUF]; + /** The pathname and filename of the message of the * day file, as defined by the administrator. */ @@ -330,6 +352,18 @@ class CoreExport ServerConfig : public Extensible */ char FixedQuit[MAXBUF]; + /** The part prefix in use, or an empty string + */ + char PrefixPart[MAXBUF]; + + /** The part suffix in use, or an empty string + */ + char SuffixPart[MAXBUF]; + + /** The fixed part message in use, or an empty string + */ + char FixedPart[MAXBUF]; + /** The last string found within a tag, or * an empty string. */ @@ -494,28 +528,15 @@ class CoreExport ServerConfig : public Extensible */ 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; + std::map SocketIOHookModule; /** The 005 tokens of this server (ISUPPORT) * populated/repopulated upon loading or unloading @@ -608,7 +629,7 @@ class CoreExport ServerConfig : public Extensible * makes code simpler. 0AA, 1BB etc with letters are reserved * for services use. */ - int sid; + char sid[MAXBUF]; /** Construct a new ServerConfig */ @@ -628,13 +649,13 @@ class CoreExport ServerConfig : public Extensible /** Send the 005 numerics (ISUPPORT) to a user */ - void Send005(userrec* user); + void Send005(User* user); /** 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(bool bail, User* user, int pass); /** Read a file into a file_cache object */ @@ -644,19 +665,19 @@ class CoreExport ServerConfig : public Extensible * @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. + * If the parameter is NULL, the messages are spooled to all opers. */ - void ReportConfigError(const std::string &errormessage, bool bail, userrec* user); + void ReportConfigError(const std::string &errormessage, bool bail, 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. */ - bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream); + bool LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only); /** 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); + bool LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only = NULL); /* Both these return true if the value existed or false otherwise */ @@ -713,6 +734,12 @@ class CoreExport ServerConfig : public Extensible /** Returns the numbers of vars inside the index'th 'tag in the config file */ int ConfVarEnum(ConfigDataHash &target, const std::string &tag, int index); + + void ValidateHostname(const char* p, const std::string &tag, const std::string &val); + + 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 @@ -734,25 +761,25 @@ class CoreExport ServerConfig : public Extensible */ bool DelIOHook(int port); - /** Get a pointer to the module which has hooked the given InspSocket class. + /** 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 */ - Module* GetIOHook(InspSocket* is); + Module* GetIOHook(BufferedSocket* is); - /** Hook a module to an InspSocket class, so that it can receive notifications + /** Hook a module to an BufferedSocket class, so that it can receive notifications * of low-level socket activity. * @param iomod The module to hook to the socket - * @param is The InspSocket to attach to + * @param is The BufferedSocket to attach to * @return True if the hook was successful. */ - bool AddIOHook(Module* iomod, InspSocket* is); + bool AddIOHook(Module* iomod, BufferedSocket* is); - /** Delete a module hook from an InspSocket. - * @param is The InspSocket to detatch from. + /** Delete a module hook from an BufferedSocket. + * @param is The BufferedSocket to detatch from. * @return True if the unhook was successful */ - bool DelIOHook(InspSocket* is); + bool DelIOHook(BufferedSocket* is); /** Returns the fully qualified path to the inspircd directory * @return The full program directory @@ -803,5 +830,30 @@ bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &val */ bool DoneClassesAndTypes(ServerConfig* conf, const char* tag); + + +/** Initialize x line + */ +bool InitXLine(ServerConfig* conf, const char* tag); + +/** Add a config-defined zline + */ +bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); + +/** Add a config-defined qline + */ +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); + +/** Add a config-defined kline + */ +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); + +/** Add a config-defined eline + */ +bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types); + + + + #endif