* | 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
* 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);
-
- public:
+
+ public:
+
+ std::ostringstream errstr;
+
+ ConfigDataHash newconfig;
+
+ std::map<std::string, std::istream*> IncludedFiles;
+
+ std::map<std::string, bool> 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 };
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.
*/
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 <die> tag, or
* an empty string.
*/
*/
ClassVector Classes;
- /** A list of module names (names only, no paths)
- * which are currently loaded by the server.
- */
- std::vector<std::string> module_names;
-
/** A list of the classes for listening client ports
*/
std::vector<ListenSocket*> 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<int,Module*> IOHookModule;
* makes code simpler. 0AA, 1BB etc with letters are reserved
* for services use.
*/
- int sid;
+ char sid[MAXBUF];
/** Construct a new ServerConfig
*/
* and initialize this class. All other methods
* should be used only by the core.
*/
- void Read(bool bail, User* user);
+ void Read(bool bail, User* user, int pass);
/** Read a file into a file_cache object
*/
/** 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 */