X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=bc26cbd95c39513f7e6ccff0a4332448d771d478;hb=fd355973486299b3db37a4ec46125476f59db0ef;hp=d9afb99dd3ef63e9665e6dc4bd7fade55f80b9e6;hpb=5e1f2c1728b200951c0f192f2e2c6b83d53c879c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index d9afb99dd..bc26cbd95 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 @@ -36,7 +36,7 @@ bool DoneELine(ServerConfig* conf, const char* tag); ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) { this->ClearStack(); - *ServerName = *Network = *ServerDesc = *AdminName = '\0'; + *sid = *ServerName = *Network = *ServerDesc = *AdminName = '\0'; *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0'; *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0'; @@ -47,13 +47,12 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) dns_timeout = DieDelay = 5; MaxTargets = 20; NetBufferSize = 10240; - SoftLimit = MAXCLIENTS; + SoftLimit = Instance->SE->GetMaxFds(); MaxConn = SOMAXCONN; MaxWhoResults = 0; debugging = 0; MaxChans = 20; OperMaxChans = 30; - LogLevel = DEFAULT; maxbans.clear(); DNSServerValidator = &ValidateDnsServer; } @@ -63,32 +62,12 @@ void ServerConfig::ClearStack() include_stack.clear(); } -Module* ServerConfig::GetIOHook(int port) -{ - std::map::iterator x = IOHookModule.find(port); - return (x != IOHookModule.end() ? x->second : NULL); -} - Module* ServerConfig::GetIOHook(BufferedSocket* is) { std::map::iterator x = SocketIOHookModule.find(is); return (x != SocketIOHookModule.end() ? x->second : NULL); } -bool ServerConfig::AddIOHook(int port, Module* iomod) -{ - if (!GetIOHook(port)) - { - IOHookModule[port] = iomod; - return true; - } - else - { - throw ModuleException("Port already hooked by another module"); - return false; - } -} - bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is) { if (!GetIOHook(is)) @@ -104,17 +83,6 @@ bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is) } } -bool ServerConfig::DelIOHook(int port) -{ - std::map::iterator x = IOHookModule.find(port); - if (x != IOHookModule.end()) - { - IOHookModule.erase(x); - return true; - } - return false; -} - bool ServerConfig::DelIOHook(BufferedSocket* is) { std::map::iterator x = SocketIOHookModule.find(is); @@ -157,12 +125,12 @@ void ServerConfig::Update005() void ServerConfig::Send005(User* user) { for (std::vector::iterator line = ServerInstance->Config->isupport.begin(); line != ServerInstance->Config->isupport.end(); line++) - user->WriteServ("005 %s %s", user->nick, line->c_str()); + user->WriteNumeric(005, "%s %s", user->nick.c_str(), line->c_str()); } -bool ServerConfig::CheckOnce(char* tag) +bool ServerConfig::CheckOnce(const char* tag, ConfigDataHash &newconf) { - int count = ConfValueEnum(this->config_data, tag); + int count = ConfValueEnum(newconf, tag); if (count > 1) { @@ -284,7 +252,7 @@ bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem { if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) { - conf->GetInstance()->Log(DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); data.Set(20); } return true; @@ -292,10 +260,10 @@ bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data) { - if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS)) + if ((data.GetInteger() < 1) || (data.GetInteger() > conf->GetInstance()->SE->GetMaxFds())) { - conf->GetInstance()->Log(DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS); - data.Set(MAXCLIENTS); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",conf->GetInstance()->SE->GetMaxFds(),conf->GetInstance()->SE->GetMaxFds()); + data.Set(conf->GetInstance()->SE->GetMaxFds()); } return true; } @@ -303,7 +271,7 @@ bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem & bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data) { if (data.GetInteger() > SOMAXCONN) - conf->GetInstance()->Log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); return true; } @@ -334,8 +302,8 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem & { std::string nameserver; // attempt to look up their nameserver from /etc/resolv.conf - conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); - ifstream resolv("/etc/resolv.conf"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); + std::ifstream resolv("/etc/resolv.conf"); bool found_server = false; if (resolv.is_open()) @@ -347,19 +315,19 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem & resolv >> nameserver; data.Set(nameserver.c_str()); found_server = true; - conf->GetInstance()->Log(DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); } } if (!found_server) { - conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); data.Set("127.0.0.1"); } } else { - conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); data.Set("127.0.0.1"); } } @@ -368,19 +336,15 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem & bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data) { + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server name"); /* If we already have a servername, and they changed it, we should throw an exception. */ - if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName)) + if (!strchr(data.GetString(), '.')) { - throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied."); - /* We don't actually reach this return of course... */ - return false; - } - if (!strchr(data.GetString(),'.')) - { - conf->GetInstance()->Log(DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.'); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",data.GetString(),data.GetString(),'.'); std::string moo = std::string(data.GetString()).append("."); data.Set(moo.c_str()); } + conf->ValidateHostname(data.GetString(), "server", "name"); return true; } @@ -388,7 +352,7 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueIt { if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024)) { - conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); data.Set(10240); } return true; @@ -398,33 +362,12 @@ bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &dat { if ((data.GetInteger() > 65535) || (data.GetInteger() < 1)) { - conf->GetInstance()->Log(DEFAULT," size out of range, setting to default of 128."); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT," size out of range, setting to default of 128."); data.Set(128); } return true; } -bool ValidateLogLevel(ServerConfig* conf, const char*, const char*, ValueItem &data) -{ - std::string dbg = data.GetString(); - conf->LogLevel = DEFAULT; - - if (dbg == "debug") - conf->LogLevel = DEBUG; - else if (dbg == "verbose") - conf->LogLevel = VERBOSE; - else if (dbg == "default") - conf->LogLevel = DEFAULT; - else if (dbg == "sparse") - conf->LogLevel = SPARSE; - else if (dbg == "none") - conf->LogLevel = NONE; - - conf->debugging = (conf->LogLevel == DEBUG); - - return true; -} - bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data) { conf->ReadFile(conf->MOTD, data.GetString()); @@ -478,13 +421,17 @@ 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)) + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Validating server id"); + + 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."); } + + strlcpy(conf->sid, sid, 5); + return true; } @@ -501,7 +448,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &dat if (conf->WhoWasMaxKeep < 3600) { conf->WhoWasMaxKeep = 3600; - conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); @@ -518,29 +465,30 @@ bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &dat */ bool InitConnect(ServerConfig* conf, const char*) { - conf->GetInstance()->Log(DEFAULT,"Reading connect classes..."); - - for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++) - { - ConnectClass *c = *i; + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Reading connect classes..."); - 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!"); + conf->GetInstance()->Logs->Log("CONFIG",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 +515,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. @@ -574,17 +523,22 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) */ for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) { - ConnectClass* c = *item; - if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny))) + ConnectClass* cc = *item; + if ( + ((*name && (cc->GetName() == name)) || // if the name is the same + (*allow && (cc->GetHost() == allow)) || // or the allow is the same + (*deny && (cc->GetHost() == deny))) && // or the deny is the same + (!port || port && (cc->GetPort() == port)) // and there is no port, or there is a port and the port is the same + ) { /* reenable class so users can be shoved into it :P */ - c->SetDisabled(false); - conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!"); + cc->SetDisabled(false); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Not adding class, it already exists!"); return true; } } - conf->GetInstance()->Log(DEFAULT,"Adding a connect class!"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!"); if (*parent) { @@ -594,11 +548,11 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) ClassVector::iterator item = conf->Classes.begin(); for (; item != conf->Classes.end(); ++item) { - ConnectClass* c = *item; - conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str()); - if (c->GetName() == parent) + ConnectClass* cc = *item; + conf->GetInstance()->Logs->Log("CONFIG",DEBUG,"Class: %s", cc->GetName().c_str()); + if (cc->GetName() == parent) { - ConnectClass* newclass = new ConnectClass(name, c); + ConnectClass* newclass = new ConnectClass(name, cc); newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); conf->Classes.push_back(newclass); break; @@ -611,16 +565,35 @@ 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); - c->limit = limit; - c->SetPort(port); - conf->Classes.push_back(c); + /* Find existing class by mask, the mask should be unique */ + for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + { + if ((*item)->GetHost() == allow) + { + (*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); + return true; + } + } + ConnectClass* cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); + cc->limit = limit; + cc->SetPort(port); + conf->Classes.push_back(cc); } else { - ConnectClass* c = new ConnectClass(name, deny); - c->SetPort(port); - conf->Classes.push_back(c); + /* Find existing class by mask, the mask should be unique */ + for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + { + if ((*item)->GetHost() == deny) + { + (*item)->Update(name, deny); + (*item)->SetPort(port); + return true; + } + } + ConnectClass* cc = new ConnectClass(name, deny); + cc->SetPort(port); + conf->Classes.push_back(cc); } } @@ -631,7 +604,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) */ bool DoneConnect(ServerConfig *conf, const char*) { - conf->GetInstance()->Log(DEFAULT, "Done adding connect classes!"); + conf->GetInstance()->Logs->Log("CONFIG",DEFAULT, "Done adding connect classes!"); return true; } @@ -742,7 +715,7 @@ bool DoneMaxBans(ServerConfig*, const char*) void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, User* user) { - ServerInstance->Log(DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); + ServerInstance->Logs->Log("CONFIG",DEFAULT, "There were errors in your configuration file: %s", errormessage.c_str()); if (bail) { /* Unneeded because of the ServerInstance->Log() aboive? */ @@ -758,20 +731,20 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ if (user) { - prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; - user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); + prefixlen = strlen(this->ServerName) + user->nick.length() + 11; + user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick.c_str()); while (start < errors.length()) { - user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); + user->WriteServ("NOTICE %s :%s",user->nick.c_str(), errors.substr(start, 510 - prefixlen).c_str()); start += 510 - prefixlen; } } 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)); start += 360; } } @@ -781,286 +754,334 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, void ServerConfig::Read(bool bail, User* user) { - int rem = 0, add = 0; /* Number of modules added, number of modules removed */ + int rem = 0, add = 0; /* Number of modules added, number of modules removed */ - for (int pass = 0; pass < 2; pass++) - { - - ServerInstance->Log(DEBUG,"Start config pass %d", pass); - - 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 */ - std::ostringstream errstr; /* String stream containing the error output */ - - /* These tags MUST occur and must ONLY occur once in the config file */ - static char* Once[] = { "server", "admin", "files", "power", "options", NULL }; - - /* These tags can occur ONCE or not at all */ - InitialConfig Values[] = { - {"options", "softlimit", MAXCLIENTS_S, new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, - {"options", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, - {"options", "moronbanner", "Youre banned!", new ValueContainerChar (this->MoronBanner), DT_CHARPTR, NoValidation}, - {"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}, - {"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}, - {"files", "motd", "", new ValueContainerChar (this->motd), DT_CHARPTR, ValidateMotd}, - {"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", "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", "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}, - {"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}, - {"disabled", "commands", "", new ValueContainerChar (this->DisabledCommands), DT_CHARPTR, NoValidation}, - {"options", "userstats", "", new ValueContainerChar (this->UserStats), DT_CHARPTR, NoValidation}, - {"options", "customversion","", new ValueContainerChar (this->CustomVersion), DT_CHARPTR, NoValidation}, - {"options", "hidesplits", "0", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, - {"options", "hidebans", "0", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, - {"options", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation}, - {"options", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation}, - {"options", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, - {"options", "nouserdns", "0", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, - {"options", "syntaxhints", "0", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, - {"options", "cyclehosts", "0", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, - {"options", "ircumsgprefix","0", new ValueContainerBool (&this->UndernetMsgPrefix), DT_BOOLEAN, NoValidation}, - {"options", "announceinvites", "1", new ValueContainerChar (announceinvites), DT_CHARPTR, ValidateInvite}, - {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation}, - {"options", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists}, - {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps}, - {"options", "maxtargets", "20", new ValueContainerUInt (&this->MaxTargets), DT_INTEGER, ValidateMaxTargets}, - {"options", "defaultmodes", "nt", new ValueContainerChar (this->DefaultModes), DT_CHARPTR, NoValidation}, - {"pid", "file", "", new ValueContainerChar (this->PID), DT_CHARPTR, NoValidation}, - {"whowas", "groupsize", "10", new ValueContainerInt (&this->WhoWasGroupSize), DT_INTEGER, NoValidation}, - {"whowas", "maxgroups", "10240", new ValueContainerInt (&this->WhoWasMaxGroups), DT_INTEGER, NoValidation}, - {"whowas", "maxkeep", "3600", new ValueContainerChar (maxkeep), DT_CHARPTR, ValidateWhoWas}, - {"die", "value", "", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation}, - {"channels", "users", "20", new ValueContainerUInt (&this->MaxChans), DT_INTEGER, NoValidation}, - {"channels", "opers", "60", new ValueContainerUInt (&this->OperMaxChans), DT_INTEGER, NoValidation}, - {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} - }; - - /* These tags can occur multiple times, and therefore they have special code to read them - * which is different to the code for reading the singular tags listed above. - */ - MultiConfig MultiValues[] = { - - {"connect", - {"allow", "deny", "password", "timeout", "pingfreq", "flood", - "threshold", "sendq", "recvq", "localmax", "globalmax", "port", - "name", "parent", "maxchans", "limit", - NULL}, - {"", "", "", "", "120", "", - "", "", "", "3", "3", "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}, - InitConnect, DoConnect, DoneConnect}, - - {"uline", - {"server", "silent", NULL}, - {"", "0", NULL}, - {DT_HOSTNAME, DT_BOOLEAN}, - InitULine,DoULine,DoneULine}, - - {"banlist", - {"chan", "limit", NULL}, - {"", "", NULL}, - {DT_CHARPTR, DT_INTEGER}, - InitMaxBans, DoMaxBans, DoneMaxBans}, - - {"module", - {"name", NULL}, - {"", NULL}, - {DT_CHARPTR}, - InitModule, DoModule, DoneModule}, - - {"badip", - {"reason", "ipmask", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD}, - InitXLine, DoZLine, DoneConfItem}, - - {"badnick", - {"reason", "nick", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoQLine, DoneConfItem}, - - {"badhost", - {"reason", "host", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoKLine, DoneConfItem}, - - {"exception", - {"reason", "host", NULL}, - {"No reason", "", NULL}, - {DT_CHARPTR, DT_CHARPTR}, - InitXLine, DoELine, DoneELine}, + 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 */ + errstr.clear(); + + include_stack.clear(); + + /* These tags MUST occur and must ONLY occur once in the config file */ + static const char* Once[] = { "server", "admin", "files", "power", "options", NULL }; + + Deprecated ChangedConfig[] = { + {"options", "hidelinks", "has been moved to as of 1.2a3"}, + {"options", "hidewhois", "has been moved to as of 1.2a3"}, + {"options", "userstats", "has been moved to as of 1.2a3"}, + {"options", "customversion", "has been moved to as of 1.2a3"}, + {"options", "hidesplits", "has been moved to as of 1.2a3"}, + {"options", "hidebans", "has been moved to as of 1.2a3"}, + {"options", "hidekills", "has been moved to as of 1.2a3"}, + {"options", "operspywhois", "has been moved to as of 1.2a3"}, + {"options", "announceinvites", "has been moved to as of 1.2a3"}, + {"options", "hidemodes", "has been moved to as of 1.2a3"}, + {"options", "maxtargets", "has been moved to as of 1.2a3"}, + {"options", "nouserdns", "has been moved to as of 1.2a3"}, + {"options", "maxwho", "has been moved to as of 1.2a3"}, + {"options", "softlimit", "has been moved to as of 1.2a3"}, + {"options", "somaxconn", "has been moved to as of 1.2a3"}, + {"options", "netbuffersize", "has been moved to as of 1.2a3"}, + {"options", "maxwho", "has been moved to as of 1.2a3"}, + {"options", "loglevel", "1.2 does not use the loglevel value. Please define tags instead."}, + {NULL, NULL, NULL} + }; + + /* These tags can occur ONCE or not at all */ + InitialConfig Values[] = { + {"performance", "softlimit", "0", new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, + {"performance", "somaxconn", SOMAXCONN_S, new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, + {"options", "moronbanner", "Youre banned!", new ValueContainerChar (this->MoronBanner), DT_CHARPTR, NoValidation}, + {"server", "name", "", new ValueContainerChar (this->ServerName), DT_HOSTNAME|DT_BOOTONLY, ValidateServerName}, + {"server", "description", "Configure Me", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, + {"server", "network", "Network", new ValueContainerChar (this->Network), DT_NOSPACES, NoValidation}, + {"server", "id", "", new ValueContainerChar (this->sid), DT_CHARPTR|DT_BOOTONLY, 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}, + {"files", "motd", "", new ValueContainerChar (this->motd), DT_CHARPTR, ValidateMotd}, + {"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}, + {"performance", "netbuffersize","10240", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, + {"performance", "maxwho", "128", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, + {"options", "allowhalfop", "0", new ValueContainerBool (&this->AllowHalfop), 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}, + {"disabled", "commands", "", new ValueContainerChar (this->DisabledCommands), DT_CHARPTR, NoValidation}, + {"security", "userstats", "", new ValueContainerChar (this->UserStats), DT_CHARPTR, NoValidation}, + {"security", "customversion","", new ValueContainerChar (this->CustomVersion), DT_CHARPTR, NoValidation}, + {"security", "hidesplits", "0", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, + {"security", "hidebans", "0", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, + {"security", "hidewhois", "", new ValueContainerChar (this->HideWhoisServer), DT_NOSPACES, NoValidation}, + {"security", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_NOSPACES, NoValidation}, + {"security", "operspywhois", "0", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, + {"performance", "nouserdns", "0", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, + {"options", "syntaxhints", "0", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, + {"options", "cyclehosts", "0", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, + {"options", "ircumsgprefix","0", new ValueContainerBool (&this->UndernetMsgPrefix), DT_BOOLEAN, NoValidation}, + {"security", "announceinvites", "1", new ValueContainerChar (announceinvites), DT_CHARPTR, ValidateInvite}, + {"options", "hostintopic", "1", new ValueContainerBool (&this->FullHostInTopic), DT_BOOLEAN, NoValidation}, + {"security", "hidemodes", "", new ValueContainerChar (hidemodes), DT_CHARPTR, ValidateModeLists}, + {"options", "exemptchanops","", new ValueContainerChar (exemptchanops), DT_CHARPTR, ValidateExemptChanOps}, + {"security", "maxtargets", "20", new ValueContainerUInt (&this->MaxTargets), DT_INTEGER, ValidateMaxTargets}, + {"options", "defaultmodes", "nt", new ValueContainerChar (this->DefaultModes), DT_CHARPTR, NoValidation}, + {"pid", "file", "", new ValueContainerChar (this->PID), DT_CHARPTR, NoValidation}, + {"whowas", "groupsize", "10", new ValueContainerInt (&this->WhoWasGroupSize), DT_INTEGER, NoValidation}, + {"whowas", "maxgroups", "10240", new ValueContainerInt (&this->WhoWasMaxGroups), DT_INTEGER, NoValidation}, + {"whowas", "maxkeep", "3600", new ValueContainerChar (maxkeep), DT_CHARPTR, ValidateWhoWas}, + {"die", "value", "", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation}, + {"channels", "users", "20", new ValueContainerUInt (&this->MaxChans), DT_INTEGER, NoValidation}, + {"channels", "opers", "60", new ValueContainerUInt (&this->OperMaxChans), DT_INTEGER, NoValidation}, + {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation} + }; + + /* These tags can occur multiple times, and therefore they have special code to read them + * which is different to the code for reading the singular tags listed above. + */ + MultiConfig MultiValues[] = { + + {"connect", + {"allow", "deny", "password", "timeout", "pingfreq", "flood", + "threshold", "sendq", "recvq", "localmax", "globalmax", "port", + "name", "parent", "maxchans", "limit", "hash", + NULL}, + {"", "", "", "", "120", "", + "", "", "", "3", "3", "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_CHARPTR}, + InitConnect, DoConnect, DoneConnect}, + + {"uline", + {"server", "silent", NULL}, + {"", "0", NULL}, + {DT_HOSTNAME, DT_BOOLEAN}, + InitULine,DoULine,DoneULine}, + + {"banlist", + {"chan", "limit", NULL}, + {"", "", NULL}, + {DT_CHARPTR, DT_INTEGER}, + InitMaxBans, DoMaxBans, DoneMaxBans}, + + {"module", + {"name", NULL}, + {"", NULL}, + {DT_CHARPTR}, + InitModule, DoModule, DoneModule}, + + {"badip", + {"reason", "ipmask", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_IPADDRESS|DT_ALLOW_WILD}, + InitXLine, DoZLine, DoneConfItem}, + + {"badnick", + {"reason", "nick", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoQLine, DoneConfItem}, - {"type", - {"name", "classes", NULL}, - {"", "", NULL}, - {DT_NOSPACES, DT_CHARPTR}, - InitTypes, DoType, DoneClassesAndTypes}, + {"badhost", + {"reason", "host", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoKLine, DoneConfItem}, + + {"exception", + {"reason", "host", NULL}, + {"No reason", "", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoELine, DoneELine}, - {"class", - {"name", "commands", NULL}, - {"", "", NULL}, - {DT_NOSPACES, DT_CHARPTR}, - InitClasses, DoClass, DoneClassesAndTypes}, + {"type", + {"name", "classes", NULL}, + {"", "", NULL}, + {DT_NOSPACES, DT_CHARPTR}, + InitTypes, DoType, DoneClassesAndTypes}, + + {"class", + {"name", "commands", "usermodes", "chanmodes", NULL}, + {"", "", "", "", NULL}, + {DT_NOSPACES, DT_CHARPTR, DT_CHARPTR, DT_CHARPTR}, + InitClasses, DoClass, DoneClassesAndTypes}, - {NULL, - {NULL}, - {NULL}, - {0}, - NULL, NULL, NULL} - }; + {NULL, + {NULL}, + {NULL}, + {0}, + NULL, NULL, NULL} + }; + + /* Load and parse the config file, if there are any errors then explode */ - include_stack.clear(); + /* Make a copy here so if it fails then we can carry on running with an unaffected config */ + newconfig.clear(); - /* Load and parse the config file, if there are any errors then explode */ + if (!this->DoInclude(newconfig, ServerInstance->ConfigFileName, errstr)) + { + ReportConfigError(errstr.str(), bail, user); + return; + } - /* Make a copy here so if it fails then we can carry on running with an unaffected config */ - ConfigDataHash newconfig; + /* 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], newconfig)) + return; - if (this->LoadConf(newconfig, ServerInstance->ConfigFileName, errstr, pass)) + for (int Index = 0; ChangedConfig[Index].tag; Index++) { - /* If we succeeded, set the ircd config to the new one */ - this->config_data = newconfig; - } - else - { - ReportConfigError(errstr.str(), bail, user); - return; + char item[MAXBUF]; + *item = 0; + if (ConfValue(newconfig, ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item) + throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason); + else + ServerInstance->Logs->Log("CONFIG",DEBUG,"Deprecated item <%s:%s> does not exist, good.", ChangedConfig[Index].tag, ChangedConfig[Index].value); } - /* The stuff in here may throw CoreException, be sure we're in a position to catch it. */ - try + /* 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++) { - /* 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++) - { - char item[MAXBUF]; - int dt = Values[Index].datatype; - bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); - bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); - dt &= ~DT_ALLOW_NEWLINE; - dt &= ~DT_ALLOW_WILD; - - 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."); + char item[MAXBUF]; + int dt = Values[Index].datatype; + bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); + bool bootonly = ((dt & DT_BOOTONLY) > 0); + dt &= ~DT_ALLOW_NEWLINE; + dt &= ~DT_ALLOW_WILD; + dt &= ~DT_BOOTONLY; + + /* Silently ignore boot only values */ + if (bootonly && !bail) + continue; + + ConfValue(newconfig, 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) + ServerInstance->Threads->Mutex(true); + switch (dt) + { + case DT_NOSPACES: { - case DT_NOSPACES: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_HOSTNAME: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_IPADDRESS: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_CHANNEL: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString())) - throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name"); - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_CHARPTR: - { - ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; - /* Make sure we also copy the null terminator */ - vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); - } - break; - case DT_INTEGER: - { - int val = vi.GetInteger(); - ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; - vci->Set(&val, sizeof(int)); - } - break; - case DT_BOOLEAN: + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateNoSpaces(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_HOSTNAME: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateHostname(vi.GetString(), Values[Index].tag, Values[Index].value); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + ServerInstance->Logs->Log("CONFIG",DEFAULT,"Got %s", vi.GetString()); + } + break; + case DT_IPADDRESS: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + this->ValidateIP(vi.GetString(), Values[Index].tag, Values[Index].value, allow_wild); + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_CHANNEL: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + if (*(vi.GetString()) && !ServerInstance->IsChannel(vi.GetString())) { - bool val = vi.GetBool(); - ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; - vcb->Set(&val, sizeof(bool)); + ServerInstance->Threads->Mutex(false); + throw CoreException("The value of <"+std::string(Values[Index].tag)+":"+Values[Index].value+"> is not a valid channel name"); } - break; - default: - /* You don't want to know what happens if someones bad code sends us here. */ - break; + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); } - - /* We're done with this now */ - delete Values[Index].val; + break; + case DT_CHARPTR: + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + /* Make sure we also copy the null terminator */ + vcc->Set(vi.GetString(), strlen(vi.GetString()) + 1); + } + break; + case DT_INTEGER: + { + int val = vi.GetInteger(); + ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; + vci->Set(&val, sizeof(int)); + } + break; + case DT_BOOLEAN: + { + bool val = vi.GetBool(); + ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; + vcb->Set(&val, sizeof(bool)); + } + break; + default: + /* 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; + ServerInstance->Threads->Mutex(false); + } - /* Read the multiple-tag items (class tags, connect tags, etc) - * and call the callbacks associated with them. We have three - * callbacks for these, a 'start', 'item' and 'end' callback. - */ - for (int Index = 0; MultiValues[Index].tag; Index++) + /* Read the multiple-tag items (class tags, connect tags, etc) + * and call the callbacks associated with them. We have three + * callbacks for these, a 'start', 'item' and 'end' callback. + */ + for (int Index = 0; MultiValues[Index].tag; Index++) + { + ServerInstance->Threads->Mutex(true); + MultiValues[Index].init_function(this, MultiValues[Index].tag); + ServerInstance->Threads->Mutex(false); + + int number_of_tags = ConfValueEnum(newconfig, MultiValues[Index].tag); + + for (int tagnum = 0; tagnum < number_of_tags; tagnum++) { - MultiValues[Index].init_function(this, MultiValues[Index].tag); - - int number_of_tags = ConfValueEnum(this->config_data, MultiValues[Index].tag); - - for (int tagnum = 0; tagnum < number_of_tags; tagnum++) + ValueList vl; + for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++) { - ValueList vl; - for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++) + int dt = MultiValues[Index].datatype[valuenum]; + bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); + bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); + dt &= ~DT_ALLOW_NEWLINE; + dt &= ~DT_ALLOW_WILD; + + ServerInstance->Threads->Mutex(true); + /* We catch and rethrow any exception here just so we can free our mutex + */ + try { - int dt = MultiValues[Index].datatype[valuenum]; - bool allow_newlines = ((dt & DT_ALLOW_NEWLINE) > 0); - bool allow_wild = ((dt & DT_ALLOW_WILD) > 0); - dt &= ~DT_ALLOW_NEWLINE; - dt &= ~DT_ALLOW_WILD; - switch (dt) { case DT_NOSPACES: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) + if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem("")); @@ -1070,7 +1091,7 @@ void ServerConfig::Read(bool bail, User* user) case DT_HOSTNAME: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) + if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem("")); @@ -1080,7 +1101,7 @@ void ServerConfig::Read(bool bail, User* user) case DT_IPADDRESS: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) + if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem("")); @@ -1090,7 +1111,7 @@ void ServerConfig::Read(bool bail, User* user) case DT_CHANNEL: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) + if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem("")); @@ -1101,7 +1122,7 @@ void ServerConfig::Read(bool bail, User* user) case DT_CHARPTR: { char item[MAXBUF]; - if (ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) + if (ConfValue(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item, MAXBUF, allow_newlines)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem("")); @@ -1110,7 +1131,7 @@ void ServerConfig::Read(bool bail, User* user) case DT_INTEGER: { int item = 0; - if (ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item)) + if (ConfValueInteger(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum, item)) vl.push_back(ValueItem(item)); else vl.push_back(ValueItem(0)); @@ -1118,7 +1139,7 @@ void ServerConfig::Read(bool bail, User* user) break; case DT_BOOLEAN: { - bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum); + bool item = ConfValueBool(newconfig, MultiValues[Index].tag, MultiValues[Index].items[valuenum], MultiValues[Index].items_default[valuenum], tagnum); vl.push_back(ValueItem(item)); } break; @@ -1127,55 +1148,75 @@ void ServerConfig::Read(bool bail, User* user) break; } } - - MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); + catch (CoreException &e) + { + ServerInstance->Threads->Mutex(false); + throw e; + } + ServerInstance->Threads->Mutex(false); } - - MultiValues[Index].finish_function(this, MultiValues[Index].tag); + MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } - + MultiValues[Index].finish_function(this, MultiValues[Index].tag); } - catch (CoreException &ce) - { - ReportConfigError(ce.GetReason(), bail, user); - return; - } + } - /** XXX END PASS **/ - ServerInstance->Log(DEBUG,"End config pass %d", pass); + catch (CoreException &ce) + { + ReportConfigError(ce.GetReason(), bail, user); + return; + } - if (pass == 0) + ServerInstance->Threads->Mutex(true); + for (int i = 0; i < ConfValueEnum(newconfig, "type"); ++i) + { + char item[MAXBUF], classn[MAXBUF], classes[MAXBUF]; + std::string classname; + ConfValue(newconfig, "type", "classes", "", i, classes, MAXBUF, false); + irc::spacesepstream str(classes); + ConfValue(newconfig, "type", "name", "", i, item, MAXBUF, false); + while (str.GetToken(classname)) { - /* FIRST PASS: Set up commands, load modules. - * We cannot gaurantee that all config is correct - * at this point - */ - - /** Note: This is safe, the method checks for user == NULL */ - ServerInstance->Parser->SetupCommandTable(user); - ServerInstance->Modules->LoadAll(); + std::string lost; + bool foundclass = false; + for (int j = 0; j < ConfValueEnum(newconfig, "class"); ++j) + { + ConfValue(newconfig, "class", "name", "", j, classn, MAXBUF, false); + if (!strcmp(classn, classname.c_str())) + { + foundclass = true; + break; + } + } + if (!foundclass) + { + if (user) + user->WriteServ("NOTICE %s :*** Warning: Oper type '%s' has a missing class named '%s', this does nothing!", user->nick.c_str(), item, classname.c_str()); + else + { + if (bail) + printf("Warning: Oper type '%s' has a missing class named '%s', this does nothing!\n", item, classname.c_str()); + else + ServerInstance->SNO->WriteToSnoMask('A', "Warning: Oper type '%s' has a missing class named '%s', this does nothing!", item, classname.c_str()); + } + } } - 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; - } + /* If we succeeded, set the ircd config to the new one */ + this->config_data = newconfig; - } + ServerInstance->Threads->Mutex(false); // write once here, to try it out and make sure its ok ServerInstance->WritePID(this->PID); - ServerInstance->Log(DEFAULT,"Done reading configuration file."); + /* Switch over logfiles */ + ServerInstance->Logs->CloseLogs(); + ServerInstance->Logs->OpenFileLogs(); + + ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file."); /* If we're rehashing, let's load any new modules, and unload old ones */ @@ -1187,69 +1228,81 @@ void ServerConfig::Read(bool bail, User* user) if (pl.size() && user) { - user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick); - user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick); + ServerInstance->Threads->Mutex(true); + user->WriteServ("NOTICE %s :*** Not all your client ports could be bound.", user->nick.c_str()); + user->WriteServ("NOTICE %s :*** The following port(s) failed to bind:", user->nick.c_str()); int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { - user->WriteServ("NOTICE %s :*** %d. IP: %s Port: %lu", user->nick, j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); + user->WriteServ("NOTICE %s :*** %d. IP: %s Port: %lu", user->nick.c_str(), j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); } + ServerInstance->Threads->Mutex(false); } - } - if (!removed_modules.empty()) - { - for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) + ServerInstance->Threads->Mutex(true); + if (!removed_modules.empty()) { - 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 + for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - if (user) - user->WriteServ("972 %s %s :%s",user->nick, removing->c_str(), ServerInstance->Modules->LastError().c_str()); + if (ServerInstance->Modules->Unload(removing->c_str())) + { + ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH UNLOADED MODULE: %s",removing->c_str()); + + if (user) + user->WriteNumeric(973, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str()); + + rem++; + } + else + { + if (user) + user->WriteNumeric(972, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str()); + } } } - } - if (!added_modules.empty()) - { - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + if (!added_modules.empty()) { - if (ServerInstance->Modules->Load(adding->c_str())) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - ServerInstance->WriteOpers("*** 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 (ServerInstance->Modules->Load(adding->c_str())) + { + ServerInstance->SNO->WriteToSnoMask('A', "*** REHASH LOADED MODULE: %s",adding->c_str()); - add++; - } - else - { - if (user) - user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str()); + if (user) + user->WriteNumeric(975, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str()); + + add++; + } + else + { + if (user) + user->WriteNumeric(974, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str()); + } } } - } - ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules in pass 2.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); + ServerInstance->Logs->Log("CONFIG", 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()); + + ServerInstance->Threads->Mutex(false); + + } /** Note: This is safe, the method checks for user == NULL */ - /*ServerInstance->Parser->SetupCommandTable(user);*/ + ServerInstance->Threads->Mutex(true); + ServerInstance->Parser->SetupCommandTable(user); + ServerInstance->Threads->Mutex(false); if (user) - user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick); + user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str()); else - ServerInstance->WriteOpers("*** Successfully rehashed server."); + ServerInstance->SNO->WriteToSnoMask('A', "*** Successfully rehashed server."); + } -bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::ostringstream &errorstream, int pass) + +bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const char* filename, std::ostringstream &errorstream) { - std::ifstream conf(filename); std::string line; char ch; long linenumber; @@ -1263,26 +1316,14 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o in_quote = false; in_comment = false; + ServerInstance->Logs->Log("CONFIG", DEBUG, "Reading %s", filename); + /* Check if the file open failed first */ - if (!conf && (pass == 1)) + if (!conf) { - int MOD_RESULT = 0; - std::stringstream filedata; - /** XXX: THIS SHOULD BE NONBLOCKING WITH A CALLBACK, RETURN A VALUE LIKE - * LOADCONF_TRYAGAIN, LOADCONF_DONE_WITH_ERROR, LOADCONF_DONE_COMPLETE - */ - FOREACH_RESULT(I_OnDownloadFile, OnDownloadFile(filename, filedata)); - if (MOD_RESULT == 0) - { - errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; - return false; - } + errorstream << "LoadConf: Couldn't open config file: " << filename << std::endl; + return false; } - else if (!conf && (pass == 0)) - return true; - - /* 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++) { @@ -1297,9 +1338,8 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o include_stack.push_back(filename); /* Start reading characters... */ - while (conf.get(ch)) + while ((ch = fgetc(conf)) != EOF) { - /* * Fix for moronic windows issue spotted by Adremelech. * Some windows editors save text files as utf-16, which is @@ -1356,8 +1396,9 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o { line += ch; char real_character; - if (conf.get(real_character)) + if (!feof(conf)) { + real_character = fgetc(conf); if (real_character == 'n') real_character = '\n'; line += real_character; @@ -1432,15 +1473,14 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o { // errorstream << "Closing config tag on line " << linenumber << std::endl; in_tag = false; - + /* * If this finds an then ParseLine can simply call * LoadConf() and load the included config into the same ConfigDataHash */ - - if (!this->ParseLine(target, line, linenumber, errorstream, pass)) + if (!this->ParseLine(target, line, linenumber, errorstream)) return false; - + line.clear(); } else @@ -1462,12 +1502,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o return true; } -bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, std::ostringstream &errorstream, int pass) + +bool ServerConfig::LoadConf(ConfigDataHash &target, FILE* &conf, const std::string &filename, std::ostringstream &errorstream) { - return this->LoadConf(target, filename.c_str(), errorstream, pass); + return this->LoadConf(target, conf, filename.c_str(), errorstream); } -bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream, int pass) +bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream) { std::string tagname; std::string current_key; @@ -1556,7 +1597,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li } else { - /* Leaving quotes, we have the value */ + /* Leaving the quotes, we have the current value */ results.push_back(KeyVal(current_key, current_value)); // std::cout << "<" << tagname << ":" << current_key << "> " << current_value << std::endl; @@ -1565,8 +1606,14 @@ 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)) + return false; + } + else if ((tagname == "include") && (current_key == "executable")) { - if (!this->DoInclude(target, current_value, errorstream, pass)) + /* Pipe an executable and use its stdout as config data */ + if (!this->DoPipe(target, current_value, errorstream)) return false; } @@ -1591,7 +1638,28 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &li return true; } -bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream, int pass) +bool ServerConfig::DoPipe(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) +{ + FILE* conf = popen(file.c_str(), "r"); + bool ret = false; + + if (conf) + { + ret = LoadConf(target, conf, file.c_str(), errorstream); + pclose(conf); + } + else + errorstream << "Couldn't execute: " << file << std::endl; + + return ret; +} + +bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path) +{ + return (path.length() > 2 && isalpha(path[0]) && path[1] == ':'); +} + +bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, std::ostringstream &errorstream) { std::string confpath; std::string newfile; @@ -1603,7 +1671,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] != '/') && (!StartsWithWindowsDriveLetter(newfile))) { if((pos = confpath.rfind("/")) != std::string::npos) { @@ -1617,7 +1685,18 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st } } - return LoadConf(target, newfile, errorstream, pass); + FILE* conf = fopen(newfile.c_str(), "r"); + bool ret = false; + + if (conf) + { + ret = LoadConf(target, conf, newfile, errorstream); + fclose(conf); + } + else + errorstream << "Couldn't open config file: " << file << std::endl; + + return ret; } bool ServerConfig::ConfValue(ConfigDataHash &target, const char* tag, const char* var, int index, char* result, int length, bool allow_linefeeds) @@ -1654,7 +1733,7 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con { if ((!allow_linefeeds) && (j->second.find('\n') != std::string::npos)) { - ServerInstance->Log(DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); + ServerInstance->Logs->Log("CONFIG",DEFAULT, "Value of <" + tag + ":" + var+ "> contains a linefeed, and linefeeds in this value are not permitted -- stripped to spaces."); for (std::string::iterator n = j->second.begin(); n != j->second.end(); n++) if (*n == '\n') *n = ' '; @@ -1672,7 +1751,7 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con return true; } } - else if(pos == 0) + else if (pos == 0) { if (!default_value.empty()) { @@ -1814,17 +1893,19 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) F.clear(); - if ((*fname != '/') && (*fname != '\\')) + if ((*fname != '/') && (*fname != '\\') && (!StartsWithWindowsDriveLetter(fname))) { std::string::size_type pos; std::string confpath = ServerInstance->ConfigFileName; std::string newfile = fname; - if ((pos = confpath.rfind("/")) != std::string::npos) + if (((pos = confpath.rfind("/"))) != std::string::npos) newfile = confpath.substr(0, pos) + std::string("/") + fname; - else if ((pos = confpath.rfind("\\")) != std::string::npos) + else if (((pos = confpath.rfind("\\"))) != std::string::npos) newfile = confpath.substr(0, pos) + std::string("\\") + fname; + ServerInstance->Logs->Log("config", DEBUG, "Filename: %s", newfile.c_str()); + if (!FileExists(newfile.c_str())) return false; file = fopen(newfile.c_str(), "r"); @@ -1845,10 +1926,7 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) else *linebuf = 0; - if (!feof(file)) - { - F.push_back(*linebuf ? linebuf : " "); - } + F.push_back(*linebuf ? linebuf : " "); } fclose(file); @@ -1890,7 +1968,7 @@ bool ServerConfig::DirValid(const char* dirandfile) { #ifdef WINDOWS return true; -#endif +#else char work[1024]; char buffer[1024]; @@ -1941,6 +2019,7 @@ bool ServerConfig::DirValid(const char* dirandfile) { return false; } +#endif } std::string ServerConfig::GetFullProgDir() @@ -1985,11 +2064,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) @@ -2006,12 +2081,7 @@ ValueItem::ValueItem(bool value) v = n.str(); } -ValueItem::ValueItem(char* value) -{ - v = value; -} - -void ValueItem::Set(char* value) +ValueItem::ValueItem(const char* value) { v = value; } @@ -2075,8 +2145,12 @@ bool InitClasses(ServerConfig* conf, const char*) { for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) { - if (n->second) - delete[] n->second; + if (n->second.commandlist) + delete[] n->second.commandlist; + if (n->second.cmodelist) + delete[] n->second.cmodelist; + if (n->second.umodelist) + delete[] n->second.umodelist; } } @@ -2099,12 +2173,31 @@ bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*) /* * XXX should this be in a class? -- w00t */ -bool DoClass(ServerConfig* conf, const char*, char**, ValueList &values, int*) +bool DoClass(ServerConfig* conf, const char* tag, char**, ValueList &values, int*) { const char* ClassName = values[0].GetString(); const char* CommandList = values[1].GetString(); + const char* UModeList = values[2].GetString(); + const char* CModeList = values[3].GetString(); - conf->operclass[ClassName] = strnewdup(CommandList); + for (const char* c = UModeList; *c; ++c) + { + if ((*c < 'A' || *c > 'z') && *c != '*') + { + throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); + } + } + for (const char* c = CModeList; *c; ++c) + { + if ((*c < 'A' || *c > 'z') && *c != '*') + { + throw CoreException("Character " + std::string(1, *c) + " is not a valid mode in "); + } + } + + conf->operclass[ClassName].commandlist = strnewdup(CommandList); + conf->operclass[ClassName].umodelist = strnewdup(UModeList); + conf->operclass[ClassName].cmodelist = strnewdup(CModeList); return true; } @@ -2180,7 +2273,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; @@ -2190,3 +2283,12 @@ bool DoneELine(ServerConfig* conf, const char* tag) return true; } +void ConfigReaderThread::Run() +{ + /* TODO: TheUser may be invalid by the time we get here! Check its validity, or pass a UID would be better */ + ServerInstance->Config->Read(do_bail, TheUser); + ServerInstance->Threads->Mutex(true); + this->SetExitFlag(); + ServerInstance->Threads->Mutex(false); +} +