X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=dea6a7a7d9bee3df3554988c0df8d5535fcc682a;hb=8509727e16f1d9ce6c9719c8d62c7715d3699858;hp=f1fedfe96041d8e6b0209d9c444a9a97f9ce2408;hpb=335a65f4188377a6d6a218fc225802ebbe1ec408;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index f1fedfe96..dea6a7a7d 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -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 @@ -478,13 +478,13 @@ bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &dat bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data) { - int sid = data.GetInteger(); - if ((sid > 999) || (sid < 0)) + const char *sid = data.GetString(); + + if (*sid && !conf->GetInstance()->IsSID(sid)) { - sid = sid % 1000; - data.Set(sid); - conf->GetInstance()->Log(DEFAULT,"WARNING: Server ID is less than 0 or greater than 999. Set to %d", sid); + throw CoreException(std::string(sid) + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter."); } + return true; } @@ -527,20 +527,28 @@ bool InitConnect(ServerConfig* conf, const char*) conf->GetInstance()->Log(DEBUG, "Address of class is %p", c); } - for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++) + for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end() ; ) { - ConnectClass *c = *i; + ConnectClass* c = *i; /* only delete a class with refcount 0 */ if (c->RefCount == 0) { conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!"); + + /* This was causing a crash, because we'd set i to .begin() just here, but then the for loop's increment would + * set it to .begin() + 1. Which if it was already the last thing in the list, wasn't good. + * Now the increment is in the else { } below. + */ conf->Classes.erase(i); i = conf->Classes.begin(); // start over so we don't trample on a bad iterator } - - /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ - c->SetDisabled(true); + else + { + /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */ + c->SetDisabled(true); + i++; + } } return true; @@ -567,6 +575,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) const char* parent = values[13].GetString(); int maxchans = values[14].GetInteger(); unsigned long limit = values[15].GetInteger(); + const char* hashtype = values[16].GetString(); /* * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes. @@ -611,7 +620,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) { if (*allow) { - ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans); + ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); c->limit = limit; c->SetPort(port); conf->Classes.push_back(c); @@ -664,14 +673,10 @@ bool DoneULine(ServerConfig*, const char*) */ bool InitModule(ServerConfig* conf, const char*) { - old_module_names.clear(); + old_module_names = conf->GetInstance()->Modules->GetAllModuleNames(0); new_module_names.clear(); added_modules.clear(); removed_modules.clear(); - for (std::vector::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++) - { - old_module_names.push_back(*t); - } return true; } @@ -772,10 +777,10 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } else { - ServerInstance->WriteOpers("There were errors in the configuration file:"); + ServerInstance->SNO->WriteToSnoMask('A', "There were errors in the configuration file:"); while (start < errors.length()) { - ServerInstance->WriteOpers(errors.substr(start, 360).c_str()); + ServerInstance->SNO->WriteToSnoMask('A', errors.substr(start, 360).c_str()); start += 360; } } @@ -783,15 +788,16 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } } -void ServerConfig::Read(bool bail, User* user) +void ServerConfig::Read(bool bail, User* user, int pass) { + int rem = 0, add = 0; /* Number of modules added, number of modules removed */ + static char debug[MAXBUF]; /* Temporary buffer for debugging value */ static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */ static char hidemodes[MAXBUF]; /* Modes to not allow listing from users below halfop */ static char exemptchanops[MAXBUF]; /* Exempt channel ops from these modes */ static char announceinvites[MAXBUF]; /* options:announceinvites setting */ - int rem = 0, add = 0; /* Number of modules added, number of modules removed */ - std::ostringstream errstr; /* String stream containing the error output */ + errstr.clear(); /* These tags MUST occur and must ONLY occur once in the config file */ static char* Once[] = { "server", "admin", "files", "power", "options", NULL }; @@ -804,7 +810,7 @@ void ServerConfig::Read(bool bail, User* user) {"server", "name", "", new ValueContainerChar (this->ServerName), DT_HOSTNAME, ValidateServerName}, {"server", "description", "Configure Me", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, {"server", "network", "Network", new ValueContainerChar (this->Network), DT_NOSPACES, NoValidation}, - {"server", "id", "0", new ValueContainerInt (&this->sid), DT_NOSPACES, ValidateSID}, + {"server", "id", "", new ValueContainerChar (this->sid), DT_CHARPTR, ValidateSID}, {"admin", "name", "", new ValueContainerChar (this->AdminName), DT_CHARPTR, NoValidation}, {"admin", "email", "Mis@configu.red", new ValueContainerChar (this->AdminEmail), DT_CHARPTR, NoValidation}, {"admin", "nick", "Misconfigured", new ValueContainerChar (this->AdminNick), DT_CHARPTR, NoValidation}, @@ -812,14 +818,19 @@ void ServerConfig::Read(bool bail, User* user) {"files", "rules", "", new ValueContainerChar (this->rules), DT_CHARPTR, ValidateRules}, {"power", "diepass", "", new ValueContainerChar (this->diepass), DT_CHARPTR, ValidateNotEmpty}, {"power", "pause", "", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, + {"power", "hash", "", new ValueContainerChar (this->powerhash), DT_CHARPTR, NoValidation}, {"power", "restartpass", "", new ValueContainerChar (this->restartpass), DT_CHARPTR, ValidateNotEmpty}, {"options", "prefixquit", "", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, {"options", "suffixquit", "", new ValueContainerChar (this->SuffixQuit), DT_CHARPTR, NoValidation}, {"options", "fixedquit", "", new ValueContainerChar (this->FixedQuit), DT_CHARPTR, NoValidation}, + {"options", "prefixpart", "", new ValueContainerChar (this->PrefixPart), DT_CHARPTR, NoValidation}, + {"options", "suffixpart", "", new ValueContainerChar (this->SuffixPart), DT_CHARPTR, NoValidation}, + {"options", "fixedpart", "", new ValueContainerChar (this->FixedPart), DT_CHARPTR, NoValidation}, {"options", "loglevel", "default", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, {"options", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, {"options", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, + {"options", "allowdevoiceself", "0", new ValueContainerBool (&this->AllowDevoiceSelf), DT_BOOLEAN, NoValidation}, {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_IPADDRESS,DNSServerValidator}, {"dns", "timeout", "5", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, NoValidation}, {"options", "moduledir", MOD_PATH, new ValueContainerChar (this->ModPath), DT_CHARPTR, NoValidation}, @@ -859,17 +870,17 @@ void ServerConfig::Read(bool bail, User* user) {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", "threshold", "sendq", "recvq", "localmax", "globalmax", "port", - "name", "parent", "maxchans", "limit", + "name", "parent", "maxchans", "limit", "hash", NULL}, {"", "", "", "", "120", "", "", "", "", "3", "3", "0", - "", "", "0", "0", + "", "", "0", "0", "", NULL}, {DT_IPADDRESS|DT_ALLOW_WILD, DT_IPADDRESS|DT_ALLOW_WILD, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER}, + DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_NOSPACES, DT_NOSPACES, DT_INTEGER, DT_INTEGER, DT_CHARPTR}, InitConnect, DoConnect, DoneConnect}, {"uline", @@ -901,7 +912,7 @@ void ServerConfig::Read(bool bail, User* user) {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, InitXLine, DoQLine, DoneConfItem}, - + {"badhost", {"reason", "host", NULL}, {"No reason", "", NULL}, @@ -913,7 +924,7 @@ void ServerConfig::Read(bool bail, User* user) {"No reason", "", NULL}, {DT_CHARPTR, DT_CHARPTR}, InitXLine, DoELine, DoneELine}, - + {"type", {"name", "classes", NULL}, {"", "", NULL}, @@ -925,7 +936,7 @@ void ServerConfig::Read(bool bail, User* user) {"", "", NULL}, {DT_NOSPACES, DT_CHARPTR}, InitClasses, DoClass, DoneClassesAndTypes}, - + {NULL, {NULL}, {NULL}, @@ -933,14 +944,12 @@ void ServerConfig::Read(bool bail, User* user) NULL, NULL, NULL} }; - include_stack.clear(); - /* Load and parse the config file, if there are any errors then explode */ /* Make a copy here so if it fails then we can carry on running with an unaffected config */ - ConfigDataHash newconfig; + newconfig.clear(); - if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr)) + if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr, pass)) { /* If we succeeded, set the ircd config to the new one */ this->config_data = newconfig; @@ -954,12 +963,6 @@ void ServerConfig::Read(bool bail, User* user) /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ try { - /* Check we dont have more than one of singular tags, or any of them missing - */ - for (int Index = 0; Once[Index]; Index++) - if (!CheckOnce(Once[Index])) - return; - /* Read the values of all the tags which occur once or not at all, and call their callbacks. */ for (int Index = 0; Values[Index].tag; Index++) @@ -973,10 +976,10 @@ void ServerConfig::Read(bool bail, User* user) ConfValue(this->config_data, Values[Index].tag, Values[Index].value, Values[Index].default_value, 0, item, MAXBUF, allow_newlines); ValueItem vi(item); - + if (!Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi)) throw CoreException("One or more values in your configuration file failed to validate. Please see your ircd.log for more information."); - + switch (Values[Index].datatype) { case DT_NOSPACES: @@ -1033,7 +1036,6 @@ void ServerConfig::Read(bool bail, User* user) /* You don't want to know what happens if someones bad code sends us here. */ break; } - /* We're done with this now */ delete Values[Index].val; } @@ -1131,11 +1133,9 @@ void ServerConfig::Read(bool bail, User* user) break; } } - - MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); + MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } - - MultiValues[Index].finish_function(this, MultiValues[Index].tag); + MultiValues[Index].finish_function(this, MultiValues[Index].tag); } } @@ -1146,6 +1146,44 @@ void ServerConfig::Read(bool bail, User* user) return; } + /** XXX END PASS **/ + ServerInstance->Log(DEBUG,"End config pass %d", pass); + + if (pass == 0) + { + /* FIRST PASS: Set up commands, load modules. + * We cannot gaurantee that all config is correct + * at this point + */ + + if (pass == 0) + { + ServerInstance->Log(DEBUG, "Downloading configuration"); + + TotalDownloaded = 0; + FileErrors = 0; + } + + if (!ServerInstance->Res) + ServerInstance->Res = new DNS(ServerInstance); + /** Note: This is safe, the method checks for user == NULL */ + ServerInstance->Parser->SetupCommandTable(user); + ServerInstance->Modules->LoadAll(); + } + else + { + /* SECOND PASS: Call modules to read configs, finalize + * stuff. Check that we have at least the required number + * of whichever items. This is no longer done first. + */ + ConfigReader* n = new ConfigReader(ServerInstance); + FOREACH_MOD(I_OnReadConfig,OnReadConfig(this, n)); + + for (int Index = 0; Once[Index]; Index++) + if (!CheckOnce(Once[Index])) + return; + } + // write once here, to try it out and make sure its ok ServerInstance->WritePID(this->PID); @@ -1169,65 +1207,133 @@ void ServerConfig::Read(bool bail, User* user) user->WriteServ("NOTICE %s :*** %d. IP: %s Port: %lu", user->nick, j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); } } + } - if (!removed_modules.empty()) + if (!removed_modules.empty()) + { + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + if (ServerInstance->Modules->Unload(removing->c_str())) { - if (ServerInstance->Modules->Unload(removing->c_str())) - { - ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); - - if (user) - user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); - - rem++; - } - else - { - if (user) - user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError()); - } + ServerInstance->SNO->WriteToSnoMask('A', "REHASH UNLOADED MODULE: %s",removing->c_str()); + if (user) + user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); + rem++; + } + else + { + if (user) + user->WriteServ("972 %s %s :%s",user->nick, removing->c_str(), ServerInstance->Modules->LastError().c_str()); } } + } - if (!added_modules.empty()) + if (!added_modules.empty()) + { + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + /* Skip over modules that are aleready loaded for some reason */ + if (ServerInstance->Modules->Find(*adding)) + continue; + + if (bail) + printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n", adding->c_str()); + + if (ServerInstance->Modules->Load(adding->c_str())) { - if (ServerInstance->Modules->Load(adding->c_str())) - { - ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "REHASH LOADED MODULE: %s",adding->c_str()); + if (user) + user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); - if (user) - user->WriteServ("975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); + add++; + } + else + { + if (user) + user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str()); - add++; - } - else + if (bail) { - if (user) - user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError()); + printf_c("\n[\033[1;31m*\033[0m] %s\n\n", ServerInstance->Modules->LastError().c_str()); + ServerInstance->Exit(EXIT_STATUS_MODULE); } } } - - ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); } - /** Note: This is safe, the method checks for user == NULL */ - ServerInstance->Parser->SetupCommandTable(user); + ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); if (user) user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick); else - ServerInstance->WriteOpers("*** Successfully rehashed server."); + ServerInstance->SNO->WriteToSnoMask('A', "Successfully rehashed server."); +} + +/* XXX: This can and will block! */ +void ServerConfig::DoDownloads() +{ + ServerInstance->Log(DEBUG,"In DoDownloads()"); + + /* Reads all local files into the IncludedFiles map, then initiates sockets for the remote ones */ + for (std::map::iterator x = IncludedFiles.begin(); x != IncludedFiles.end(); ++x) + { + if (CompletedFiles.find(x->first) != CompletedFiles.end()) + continue; + + ServerInstance->Log(DEBUG,"StartDownloads File: %s", x->first.c_str()); + + std::string file = x->first; + if ((file[0] == '/') || (file.substr(0, 7) == "file://")) + { + /* For file:// schema files, we use std::ifstream which is a derivative of std::istream. + * For all other file schemas, we use a std::stringstream. + */ + + /* Add our own ifstream */ + std::ifstream* conf = new std::ifstream(file.c_str()); + if (!conf->fail()) + { + ServerInstance->Log(DEBUG,"file:// schema file %s loaded OK", file.c_str()); + delete x->second; + x->second = conf; + } + else + { + delete x->second; + x->second = NULL; + FileErrors++; + } + TotalDownloaded++; + } + else + { + /* Modules handle these */ + ServerInstance->Log(DEBUG,"Module-handled schema for %s", x->first.c_str()); + + /* For now, error it */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(file, x->second)); + if (MOD_RESULT == 0) + { + /* No module claimed this file */ + TotalDownloaded++; + FileErrors++; + delete x->second; + x->second = NULL; + } + else + { + /* Search new file here for more includes to parse */ + } + } + CompletedFiles[x->first] = true; + } } -bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream) +bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass, std::istream *scan_for_includes_only) { - std::ifstream conf(filename); std::string line; + std::istream* conf = NULL; char ch; long linenumber; bool in_tag; @@ -1240,30 +1346,63 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o in_quote = false; in_comment = false; - /* Check if the file open failed first */ - if (!conf) + if (scan_for_includes_only) { - errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; - return false; + ServerInstance->Log(DEBUG,"scan_for_includes_only set"); + conf = scan_for_includes_only; } - /* Fix the chmod of the file to restrict it to the current user and group */ - chmod(filename,0600); - - for (unsigned int t = 0; t < include_stack.size(); t++) + if (std::string(filename) == CONFIG_FILE) { - if (std::string(filename) == include_stack[t]) + if (!scan_for_includes_only) { - errorstream << "File " << filename << " is included recursively (looped inclusion)." << std::endl; - return false; + conf = new std::ifstream(filename); + if (conf->fail()) + { + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } + } + else + { + std::map::iterator x = IncludedFiles.find(filename); + if (x == IncludedFiles.end()) + { + if (pass == 0) + { + ServerInstance->Log(DEBUG,"Push include file %s onto map", filename); + /* First pass, we insert the file into a map, and just return true */ + IncludedFiles.insert(std::make_pair(filename,new std::stringstream)); + return true; + } + else + { + /* Second pass, look for the file in the map */ + ServerInstance->Log(DEBUG,"We are in the second pass, and %s is not in the map!", filename); + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } + else + { + if (!scan_for_includes_only) + { + if (x->second) + conf = IncludedFiles.find(filename)->second; + else + { + errorstream << "File " << filename << " could not be opened." << std::endl; + return false; + } + } } } - /* It's not already included, add it to the list of files we've loaded */ - include_stack.push_back(filename); + ServerInstance->Log(DEBUG,"Start to read conf %s %08lx", filename, conf); /* Start reading characters... */ - while (conf.get(ch)) + while (conf->get(ch)) { /* @@ -1277,6 +1416,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE')) { errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } @@ -1322,7 +1463,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o { line += ch; char real_character; - if (conf.get(real_character)) + if (conf->get(real_character)) { if (real_character == 'n') real_character = '\n'; @@ -1332,6 +1473,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o else { errorstream << "End of file after a \\, what did you want to escape?: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } @@ -1346,6 +1489,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if (!in_quote) { errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } @@ -1354,6 +1499,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if (in_quote) { errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } else @@ -1404,14 +1551,20 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * LoadConf() and load the included config into the same ConfigDataHash */ - if (!this->ParseLine(target, line, linenumber, errorstream)) + if (!this->ParseLine(target, line, linenumber, errorstream, pass, scan_for_includes_only)) + { + if (!scan_for_includes_only) + delete conf; return false; + } line.clear(); } else { errorstream << "Got a closing > when we weren't inside a tag: " << filename << ":" << linenumber << std::endl; + if (!scan_for_includes_only) + delete conf; return false; } } @@ -1425,15 +1578,17 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl; } + if (!scan_for_includes_only) + delete conf; return true; } -bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream) +bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass, std::istream* scan_for_includs_only) { - return this->LoadConf(target, filename.c_str(), errorstream); + return this->LoadConf(target, filename.c_str(), errorstream, pass, scan_for_includs_only); } -bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream) +bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only) { std::string tagname; std::string current_key; @@ -1523,7 +1678,8 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li else { /* Leaving quotes, we have the value */ - results.push_back(KeyVal(current_key, current_value)); + if (!scan_for_includes_only) + results.push_back(KeyVal(current_key, current_value)); // std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl; @@ -1531,8 +1687,8 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li got_key = false; if ((tagname == "include") && (current_key == "file")) - { - if (!this->DoInclude(target, current_value, errorstream)) + { + if (!this->DoInclude(target, current_value, errorstream, pass, scan_for_includes_only)) return false; } @@ -1552,12 +1708,13 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li } /* Finished parsing the tag, add it to the config hash */ - target.insert(std::pair (tagname, results)); + if (!scan_for_includes_only) + target.insert(std::pair (tagname, results)); return true; } -bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) +bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass, std::istream* scan_for_includes_only) { std::string confpath; std::string newfile; @@ -1569,7 +1726,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st std::replace(newfile.begin(),newfile.end(),'\\','/'); std::replace(confpath.begin(),confpath.end(),'\\','/'); - if (newfile[0] != '/') + if ((newfile[0] != '/') && (newfile.find("://") == std::string::npos)) { if((pos = confpath.rfind("/")) != std::string::npos) { @@ -1583,7 +1740,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st } } - return LoadConf(target, newfile, errorstream); + return LoadConf(target, newfile, errorstream, pass, scan_for_includes_only); } bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds) @@ -1951,11 +2108,7 @@ InspIRCd* ServerConfig::GetInstance() std::string ServerConfig::GetSID() { - std::string OurSID; - OurSID += (char)((sid / 100) + 48); - OurSID += (char)((sid / 10) % 10 + 48); - OurSID += (char)(sid % 10 + 48); - return OurSID; + return sid; } ValueItem::ValueItem(int value) @@ -2146,7 +2299,7 @@ bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &val // this should probably be moved to configreader, but atm it relies on CheckELines above. bool DoneELine(ServerConfig* conf, const char* tag) { - for (std::vector::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++) + for (std::vector::const_iterator u2 = conf->GetInstance()->Users->local_users.begin(); u2 != conf->GetInstance()->Users->local_users.end(); u2++) { User* u = (User*)(*u2); u->exempt = false; @@ -2155,4 +2308,3 @@ bool DoneELine(ServerConfig* conf, const char* tag) conf->GetInstance()->XLines->CheckELines(); return true; } -