X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=f7c867544c47c7606e8a783ec102a6bf4664f85c;hb=dfa831752c950f16872f3c485f94d408866a2e15;hp=04918e7cf001cd004b8e85aa160e465ef335beb7;hpb=d4ca01f12f539a7f3eda3a682b5d2fbb67fabdb7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index 04918e7cf..f7c867544 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -3,50 +3,35 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "configreader.h" -#include #include -#include #include -#include "message.h" #include "inspircd.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "userprocess.h" #include "xline.h" -extern ServerConfig *Config; -extern InspIRCd* ServerInstance; -extern time_t TIME; - -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; - std::vector old_module_names, new_module_names, added_modules, removed_modules; -ServerConfig::ServerConfig() +ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) { this->ClearStack(); - *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0'; + *ServerName = *Network = *ServerDesc = *AdminName = '\0'; *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0'; *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; - *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0'; + *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0'; log_file = NULL; NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false; - writelog = AllowHalfop = true; + CycleHosts = writelog = AllowHalfop = true; dns_timeout = DieDelay = 5; MaxTargets = 20; NetBufferSize = 10240; @@ -56,6 +41,9 @@ ServerConfig::ServerConfig() debugging = 0; LogLevel = DEFAULT; maxbans.clear(); + WhoWasGroupSize = 10; + WhoWasMaxGroups = WhoWasGroupSize * MAXCLIENTS; + WhoWasMaxKeep = 3600*24*3; // 3 days } void ServerConfig::ClearStack() @@ -69,6 +57,12 @@ Module* ServerConfig::GetIOHook(int port) return (x != IOHookModule.end() ? x->second : NULL); } +Module* ServerConfig::GetIOHook(InspSocket* 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)) @@ -78,8 +72,22 @@ bool ServerConfig::AddIOHook(int port, Module* iomod) } else { - ModuleException err("Port already hooked by another module"); - throw(err); + throw ModuleException("Port already hooked by another module"); + return false; + } +} + +bool ServerConfig::AddIOHook(InspSocket* is, Module* iomod) +{ + if (!GetIOHook(is)) + { + SocketIOHookModule[is] = iomod; + is->IsIOHooked = true; + return true; + } + else + { + throw ModuleException("InspSocket derived class already hooked by another module"); return false; } } @@ -95,28 +103,39 @@ bool ServerConfig::DelIOHook(int port) return false; } +bool ServerConfig::DelIOHook(InspSocket* is) +{ + std::map::iterator x = SocketIOHookModule.find(is); + if (x != SocketIOHookModule.end()) + { + SocketIOHookModule.erase(x); + return true; + } + return false; +} + bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) { - int count = ConfValueEnum(Config->config_data, tag); + int count = ConfValueEnum(this->config_data, tag); if (count > 1) { if (bail) { printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag); - Exit(0); + InspIRCd::Exit(ERROR); } else { if (user) { - WriteServ(user->fd,"There were errors in your configuration:"); - WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag); + user->WriteServ("There were errors in your configuration:"); + user->WriteServ("You have more than one <%s> tag, this is not permitted.\n",tag); } else { - WriteOpers("There were errors in the configuration file:"); - WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag); + ServerInstance->WriteOpers("There were errors in the configuration file:"); + ServerInstance->WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag); } } return false; @@ -126,19 +145,19 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) if (bail) { printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag); - Exit(0); + InspIRCd::Exit(ERROR); } else { if (user) { - WriteServ(user->fd,"There were errors in your configuration:"); - WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag); + user->WriteServ("There were errors in your configuration:"); + user->WriteServ("You have not defined a <%s> tag, this is required.",tag); } else { - WriteOpers("There were errors in the configuration file:"); - WriteOpers("You have not defined a <%s> tag, this is required.",tag); + ServerInstance->WriteOpers("There were errors in the configuration file:"); + ServerInstance->WriteOpers("You have not defined a <%s> tag, this is required.",tag); } } return false; @@ -146,67 +165,76 @@ bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) return true; } -bool NoValidation(const char* tag, const char* value, void* data) +bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - log(DEBUG,"No validation for <%s:%s>",tag,value); + conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value); return true; } -bool ValidateTempDir(const char* tag, const char* value, void* data) +bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - char* x = (char*)data; - if (!*x) - strlcpy(x,"/tmp",1024); + if ((data.GetInteger() < 0) || (data.GetInteger() > 31)) + { + conf->GetInstance()->Log(DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); + data.Set(20); + } return true; } - -bool ValidateMaxTargets(const char* tag, const char* value, void* data) + +bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - int* x = (int*)data; - if ((*x < 0) || (*x > 31)) + if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS)) { - log(DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); - *x = 20; + conf->GetInstance()->Log(DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS); + data.Set(MAXCLIENTS); } return true; } -bool ValidateSoftLimit(const char* tag, const char* value, void* data) +bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - int* x = (int*)data; - if ((*x < 1) || (*x > MAXCLIENTS)) - { - log(DEFAULT,"WARNING: value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS); - *x = MAXCLIENTS; - } + if (data.GetInteger() > SOMAXCONN) + conf->GetInstance()->Log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); + if (!data.GetInteger()) + data.Set(SOMAXCONN); return true; } -bool ValidateMaxConn(const char* tag, const char* value, void* data) +bool ValidateDnsTimeout(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - int* x = (int*)data; - if (*x > SOMAXCONN) - log(DEFAULT,"WARNING: value may be higher than the system-defined SOMAXCONN value!"); - if (!*x) - *x = SOMAXCONN; + if (!data.GetInteger()) + data.Set(5); return true; } -bool ValidateDnsTimeout(const char* tag, const char* value, void* data) +bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) { - int* x = (int*)data; - if (!*x) - *x = 5; + std::stringstream dcmds(data); + std::string thiscmd; + + /* Enable everything first */ + for (nspace::hash_map::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) + x->second->Disable(false); + + /* Now disable all the ones which the user wants disabled */ + while (dcmds >> thiscmd) + { + nspace::hash_map::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); + if (cm != ServerInstance->Parser->cmdlist.end()) + { + ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str()); + cm->second->Disable(true); + } + } return true; } -bool ValidateDnsServer(const char* tag, const char* value, void* data) +bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - char* x = (char*)data; - if (!*x) + if (!*(data.GetString())) { // attempt to look up their nameserver from /etc/resolv.conf - log(DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); + conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in /etc/resolv.conf..."); ifstream resolv("/etc/resolv.conf"); std::string nameserver; bool found_server = false; @@ -218,139 +246,158 @@ bool ValidateDnsServer(const char* tag, const char* value, void* data) if ((nameserver == "nameserver") && (!found_server)) { resolv >> nameserver; - strlcpy(x,nameserver.c_str(),MAXBUF); + data.Set(nameserver.c_str()); found_server = true; - log(DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); + conf->GetInstance()->Log(DEFAULT," set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str()); } } if (!found_server) { - log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); - strlcpy(x,"127.0.0.1",MAXBUF); + conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!"); + data.Set("127.0.0.1"); } } else { - log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); - strlcpy(x,"127.0.0.1",MAXBUF); + conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); + data.Set("127.0.0.1"); } } return true; } -bool ValidateModPath(const char* tag, const char* value, void* data) +bool ValidateModPath(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - char* x = (char*)data; - if (!*x) - strlcpy(x,MOD_PATH,MAXBUF); + if (!*(data.GetString())) + data.Set(MOD_PATH); return true; } -bool ValidateServerName(const char* tag, const char* value, void* data) +bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - char* x = (char*)data; - if (!strchr(x,'.')) + if (!strchr(data.GetString(),'.')) { - log(DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.'); - charlcat(x,'.',MAXBUF); + conf->GetInstance()->Log(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()); } - //strlower(x); return true; } -bool ValidateNetBufferSize(const char* tag, const char* value, void* data) +bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - if ((!Config->NetBufferSize) || (Config->NetBufferSize > 65535) || (Config->NetBufferSize < 1024)) + if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024)) { - log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); - Config->NetBufferSize = 10240; + conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); + data.Set(10240); } return true; } -bool ValidateMaxWho(const char* tag, const char* value, void* data) +bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - if ((!Config->MaxWhoResults) || (Config->MaxWhoResults > 65535) || (Config->MaxWhoResults < 1)) + if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1)) { - log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128."); - Config->MaxWhoResults = 128; + conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128."); + data.Set(128); } return true; } -bool ValidateLogLevel(const char* tag, const char* value, void* data) +bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - const char* dbg = (const char*)data; - Config->LogLevel = DEFAULT; - if (!strcmp(dbg,"debug")) - { - Config->LogLevel = DEBUG; - Config->debugging = 1; - } - else if (!strcmp(dbg,"verbose")) - Config->LogLevel = VERBOSE; - else if (!strcmp(dbg,"default")) - Config->LogLevel = DEFAULT; - else if (!strcmp(dbg,"sparse")) - Config->LogLevel = SPARSE; - else if (!strcmp(dbg,"none")) - Config->LogLevel = NONE; + 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(const char* tag, const char* value, void* data) +bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - readfile(Config->MOTD,Config->motd); + conf->ReadFile(conf->MOTD, data.GetString()); return true; } -bool ValidateRules(const char* tag, const char* value, void* data) +bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - readfile(Config->RULES,Config->rules); + conf->ReadFile(conf->RULES, data.GetString()); + return true; +} + +bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +{ + conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); + + if (conf->WhoWasGroupSize < 0) + conf->WhoWasGroupSize = 0; + + if (conf->WhoWasMaxGroups < 0) + conf->WhoWasMaxGroups = 0; + + if (conf->WhoWasMaxKeep < 3600) + { + conf->WhoWasMaxKeep = 3600; + conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); + } + conf->GetInstance()->Log(DEBUG,"whowas:groupsize:%d maxgroups:%d maxkeep:%d",conf->WhoWasGroupSize,conf->WhoWasMaxGroups,conf->WhoWasMaxKeep); + irc::whowas::PruneWhoWas(conf->GetInstance(), conf->GetInstance()->Time()); return true; } /* Callback called before processing the first tag */ -bool InitConnect(const char* tag) +bool InitConnect(ServerConfig* conf, const char* tag) { - log(DEFAULT,"Reading connect classes..."); - Config->Classes.clear(); + conf->GetInstance()->Log(DEFAULT,"Reading connect classes..."); + conf->Classes.clear(); return true; } /* Callback called to process a single tag */ -bool DoConnect(const char* tag, char** entries, void** values, int* types) +bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { ConnectClass c; - char* allow = (char*)values[0]; /* Yeah, there are a lot of values. Live with it. */ - char* deny = (char*)values[1]; - char* password = (char*)values[2]; - int* timeout = (int*)values[3]; - int* pingfreq = (int*)values[4]; - int* flood = (int*)values[5]; - int* threshold = (int*)values[6]; - int* sendq = (int*)values[7]; - int* recvq = (int*)values[8]; - int* localmax = (int*)values[9]; - int* globalmax = (int*)values[10]; + const char* allow = values[0].GetString(); /* Yeah, there are a lot of values. Live with it. */ + const char* deny = values[1].GetString(); + const char* password = values[2].GetString(); + int timeout = values[3].GetInteger(); + int pingfreq = values[4].GetInteger(); + int flood = values[5].GetInteger(); + int threshold = values[6].GetInteger(); + int sendq = values[7].GetInteger(); + int recvq = values[8].GetInteger(); + int localmax = values[9].GetInteger(); + int globalmax = values[10].GetInteger(); if (*allow) { c.host = allow; c.type = CC_ALLOW; c.pass = password; - c.registration_timeout = *timeout; - c.pingtime = *pingfreq; - c.flood = *flood; - c.threshold = *threshold; - c.sendqmax = *sendq; - c.recvqmax = *recvq; - c.maxlocal = *localmax; - c.maxglobal = *globalmax; + c.registration_timeout = timeout; + c.pingtime = pingfreq; + c.flood = flood; + c.threshold = threshold; + c.sendqmax = sendq; + c.recvqmax = recvq; + c.maxlocal = localmax; + c.maxglobal = globalmax; if (c.maxlocal == 0) @@ -361,7 +408,7 @@ bool DoConnect(const char* tag, char** entries, void** values, int* types) { c.threshold = 1; c.flood = 999; - log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str()); + conf->GetInstance()->Log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str()); } if (c.sendqmax == 0) c.sendqmax = 262114; @@ -371,14 +418,14 @@ bool DoConnect(const char* tag, char** entries, void** values, int* types) c.registration_timeout = 90; if (c.pingtime == 0) c.pingtime = 120; - Config->Classes.push_back(c); + conf->Classes.push_back(c); } else { c.host = deny; c.type = CC_DENY; - Config->Classes.push_back(c); - log(DEBUG,"Read connect class type DENY, host=%s",deny); + conf->Classes.push_back(c); + conf->GetInstance()->Log(DEBUG,"Read connect class type DENY, host=%s",deny); } return true; @@ -386,46 +433,46 @@ bool DoConnect(const char* tag, char** entries, void** values, int* types) /* Callback called when there are no more tags */ -bool DoneConnect(const char* tag) +bool DoneConnect(ServerConfig* conf, const char* tag) { - log(DEBUG,"DoneConnect called for tag: %s",tag); + conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag); return true; } /* Callback called before processing the first tag */ -bool InitULine(const char* tag) +bool InitULine(ServerConfig* conf, const char* tag) { - Config->ulines.clear(); + conf->ulines.clear(); return true; } /* Callback called to process a single tag */ -bool DoULine(const char* tag, char** entries, void** values, int* types) +bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* server = (char*)values[0]; - log(DEBUG,"Read ULINE '%s'",server); - Config->ulines.push_back(server); + const char* server = values[0].GetString(); + conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server); + conf->ulines.push_back(server); return true; } /* Callback called when there are no more tags */ -bool DoneULine(const char* tag) +bool DoneULine(ServerConfig* conf, const char* tag) { return true; } /* Callback called before processing the first tag */ -bool InitModule(const char* tag) +bool InitModule(ServerConfig* conf, const char* tag) { old_module_names.clear(); new_module_names.clear(); added_modules.clear(); removed_modules.clear(); - for (std::vector::iterator t = Config->module_names.begin(); t != Config->module_names.end(); t++) + for (std::vector::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++) { old_module_names.push_back(*t); } @@ -434,16 +481,16 @@ bool InitModule(const char* tag) /* Callback called to process a single tag */ -bool DoModule(const char* tag, char** entries, void** values, int* types) +bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* modname = (char*)values[0]; + const char* modname = values[0].GetString(); new_module_names.push_back(modname); return true; } /* Callback called when there are no more tags */ -bool DoneModule(const char* tag) +bool DoneModule(ServerConfig* conf, const char* tag) { // now create a list of new modules that are due to be loaded // and a seperate list of modules which are due to be unloaded @@ -478,82 +525,84 @@ bool DoneModule(const char* tag) /* Callback called before processing the first tag */ -bool InitMaxBans(const char* tag) +bool InitMaxBans(ServerConfig* conf, const char* tag) { - Config->maxbans.clear(); + conf->maxbans.clear(); return true; } /* Callback called to process a single tag */ -bool DoMaxBans(const char* tag, char** entries, void** values, int* types) +bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* channel = (char*)values[0]; - int* limit = (int*)values[1]; - Config->maxbans[channel] = *limit; + const char* channel = values[0].GetString(); + int limit = values[1].GetInteger(); + conf->maxbans[channel] = limit; return true; } /* Callback called when there are no more tags. */ -bool DoneMaxBans(const char* tag) +bool DoneMaxBans(ServerConfig* conf, const char* tag) { return true; } void ServerConfig::Read(bool bail, userrec* user) { - char debug[MAXBUF]; /* Temporary buffer for debugging value */ - char* data[12]; /* Temporary buffers for reading multiple occurance tags into */ - void* ptr[12]; /* Temporary pointers for passing to callbacks */ - int r_i[12]; /* Temporary array for casting */ + static char debug[MAXBUF]; /* Temporary buffer for debugging value */ + static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */ int rem = 0, add = 0; /* Number of modules added, number of modules removed */ 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", "pid", NULL }; + static char* Once[] = { "server", "admin", "files", "power", "options", NULL }; /* These tags can occur ONCE or not at all */ - static InitialConfig Values[] = { - {"options", "softlimit", &this->SoftLimit, DT_INTEGER, ValidateSoftLimit}, - {"options", "somaxconn", &this->MaxConn, DT_INTEGER, ValidateMaxConn}, - {"server", "name", &this->ServerName, DT_CHARPTR, ValidateServerName}, - {"server", "description", &this->ServerDesc, DT_CHARPTR, NoValidation}, - {"server", "network", &this->Network, DT_CHARPTR, NoValidation}, - {"admin", "name", &this->AdminName, DT_CHARPTR, NoValidation}, - {"admin", "email", &this->AdminEmail, DT_CHARPTR, NoValidation}, - {"admin", "nick", &this->AdminNick, DT_CHARPTR, NoValidation}, - {"files", "motd", &this->motd, DT_CHARPTR, ValidateMotd}, - {"files", "rules", &this->rules, DT_CHARPTR, ValidateRules}, - {"power", "diepass", &this->diepass, DT_CHARPTR, NoValidation}, - {"power", "pauseval", &this->DieDelay, DT_INTEGER, NoValidation}, - {"power", "restartpass", &this->restartpass, DT_CHARPTR, NoValidation}, - {"options", "prefixquit", &this->PrefixQuit, DT_CHARPTR, NoValidation}, - {"die", "value", &this->DieValue, DT_CHARPTR, NoValidation}, - {"options", "loglevel", &debug, DT_CHARPTR, ValidateLogLevel}, - {"options", "netbuffersize", &this->NetBufferSize, DT_INTEGER, ValidateNetBufferSize}, - {"options", "maxwho", &this->MaxWhoResults, DT_INTEGER, ValidateMaxWho}, - {"options", "allowhalfop", &this->AllowHalfop, DT_BOOLEAN, NoValidation}, - {"dns", "server", &this->DNSServer, DT_CHARPTR, ValidateDnsServer}, - {"dns", "timeout", &this->dns_timeout, DT_INTEGER, ValidateDnsTimeout}, - {"options", "moduledir", &this->ModPath, DT_CHARPTR, ValidateModPath}, - {"disabled", "commands", &this->DisabledCommands, DT_CHARPTR, NoValidation}, - {"options", "operonlystats", &this->OperOnlyStats, DT_CHARPTR, NoValidation}, - {"options", "customversion", &this->CustomVersion, DT_CHARPTR, NoValidation}, - {"options", "hidesplits", &this->HideSplits, DT_BOOLEAN, NoValidation}, - {"options", "hidebans", &this->HideBans, DT_BOOLEAN, NoValidation}, - {"options", "hidewhois", &this->HideWhoisServer, DT_CHARPTR, NoValidation}, - {"options", "operspywhois", &this->OperSpyWhois, DT_BOOLEAN, NoValidation}, - {"options", "tempdir", &this->TempDir, DT_CHARPTR, ValidateTempDir}, - {"options", "nouserdns", &this->NoUserDns, DT_BOOLEAN, NoValidation}, - {"pid", "file", &this->PID, DT_CHARPTR, NoValidation}, + InitialConfig Values[] = { + {"options", "softlimit", new ValueContainerUInt (&this->SoftLimit), DT_INTEGER, ValidateSoftLimit}, + {"options", "somaxconn", new ValueContainerInt (&this->MaxConn), DT_INTEGER, ValidateMaxConn}, + {"server", "name", new ValueContainerChar (this->ServerName), DT_CHARPTR, ValidateServerName}, + {"server", "description", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, + {"server", "network", new ValueContainerChar (this->Network), DT_CHARPTR, NoValidation}, + {"admin", "name", new ValueContainerChar (this->AdminName), DT_CHARPTR, NoValidation}, + {"admin", "email", new ValueContainerChar (this->AdminEmail), DT_CHARPTR, NoValidation}, + {"admin", "nick", 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, NoValidation}, + {"power", "pause", new ValueContainerInt (&this->DieDelay), DT_INTEGER, NoValidation}, + {"power", "restartpass", new ValueContainerChar (this->restartpass), DT_CHARPTR, NoValidation}, + {"options", "prefixquit", new ValueContainerChar (this->PrefixQuit), DT_CHARPTR, NoValidation}, + {"options", "loglevel", new ValueContainerChar (debug), DT_CHARPTR, ValidateLogLevel}, + {"options", "netbuffersize", new ValueContainerInt (&this->NetBufferSize), DT_INTEGER, ValidateNetBufferSize}, + {"options", "maxwho", new ValueContainerInt (&this->MaxWhoResults), DT_INTEGER, ValidateMaxWho}, + {"options", "allowhalfop", new ValueContainerBool (&this->AllowHalfop), DT_BOOLEAN, NoValidation}, + {"dns", "server", new ValueContainerChar (this->DNSServer), DT_CHARPTR, ValidateDnsServer}, + {"dns", "timeout", new ValueContainerInt (&this->dns_timeout), DT_INTEGER, ValidateDnsTimeout}, + {"options", "moduledir", new ValueContainerChar (this->ModPath), DT_CHARPTR, ValidateModPath}, + {"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", new ValueContainerBool (&this->HideSplits), DT_BOOLEAN, NoValidation}, + {"options", "hidebans", new ValueContainerBool (&this->HideBans), DT_BOOLEAN, NoValidation}, + {"options", "hidewhois", new ValueContainerChar (this->HideWhoisServer), DT_CHARPTR, NoValidation}, + {"options", "operspywhois", new ValueContainerBool (&this->OperSpyWhois), DT_BOOLEAN, NoValidation}, + {"options", "nouserdns", new ValueContainerBool (&this->NoUserDns), DT_BOOLEAN, NoValidation}, + {"options", "syntaxhints", new ValueContainerBool (&this->SyntaxHints), DT_BOOLEAN, NoValidation}, + {"options", "cyclehosts", new ValueContainerBool (&this->CycleHosts), DT_BOOLEAN, NoValidation}, + {"pid", "file", new ValueContainerChar (this->PID), DT_CHARPTR, NoValidation}, + {"whowas", "groupsize", new ValueContainerInt (&this->WhoWasGroupSize), DT_INTEGER, NoValidation}, + {"whowas", "maxgroups", new ValueContainerInt (&this->WhoWasMaxGroups), DT_INTEGER, NoValidation}, + {"whowas", "maxkeep", new ValueContainerChar (maxkeep), DT_CHARPTR, ValidateWhoWas}, + {"die", "value", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation}, {NULL} }; /* 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. */ - static MultiConfig MultiValues[] = { + MultiConfig MultiValues[] = { {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", @@ -620,33 +669,17 @@ void ServerConfig::Read(bool bail, userrec* user) if (this->LoadConf(newconfig, CONFIG_FILE, errstr)) { /* If we succeeded, set the ircd config to the new one */ - Config->config_data = newconfig; - -/* int c = 1; - std::string last; - - for(ConfigDataHash::const_iterator i = this->config_data.begin(); i != this->config_data.end(); i++) - { - c = (i->first != last) ? 1 : c+1; - last = i->first; - - std::cout << "[" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl; - - for(KeyValList::const_iterator j = i->second.begin(); j != i->second.end(); j++) - std::cout << "\t" << j->first << " = " << j->second << std::endl; - - std::cout << "[/" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl; - } - */ } + this->config_data = newconfig; + } else { - log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str()); + ServerInstance->Log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str()); if (bail) { - /* Unneeded because of the log() aboive? */ + /* Unneeded because of the ServerInstance->Log() aboive? */ printf("There were errors in your configuration:\n%s",errstr.str().c_str()); - Exit(0); + InspIRCd::Exit(ERROR); } else { @@ -655,26 +688,26 @@ void ServerConfig::Read(bool bail, userrec* user) unsigned int prefixlen; start = 0; - /* ":Config->ServerName NOTICE user->nick :" */ - prefixlen = strlen(Config->ServerName) + strlen(user->nick) + 11; + /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */ + prefixlen = strlen(this->ServerName) + strlen(user->nick) + 11; if (user) { - WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick); + user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick); while(start < errors.length()) { - WriteServ(user->fd, "NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); + user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str()); start += 510 - prefixlen; } } else { - WriteOpers("There were errors in the configuration file:"); + ServerInstance->WriteOpers("There were errors in the configuration file:"); while(start < errors.length()) { - WriteOpers(errors.substr(start, 360).c_str()); + ServerInstance->WriteOpers(errors.substr(start, 360).c_str()); start += 360; } } @@ -686,139 +719,166 @@ void ServerConfig::Read(bool bail, userrec* user) /* 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],bail,user)) + if (!CheckOnce(Once[Index], bail, user)) 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++) { - int* val_i = (int*) Values[Index].val; - char* val_c = (char*) Values[Index].val; + char item[MAXBUF]; + ConfValue(this->config_data, Values[Index].tag, Values[Index].value, 0, item, MAXBUF); + ValueItem vi(item); + + Values[Index].validation_function(this, Values[Index].tag, Values[Index].value, vi); switch (Values[Index].datatype) { case DT_CHARPTR: - /* Assuming MAXBUF here, potentially unsafe */ - ConfValue(this->config_data, Values[Index].tag, Values[Index].value, 0, val_c, MAXBUF); + { + ValueContainerChar* vcc = (ValueContainerChar*)Values[Index].val; + vcc->Set(vi.GetString(), strlen(vi.GetString())); + } break; - case DT_INTEGER: - ConfValueInteger(this->config_data, Values[Index].tag, Values[Index].value, 0, *val_i); + { + int val = vi.GetInteger(); + ValueContainerInt* vci = (ValueContainerInt*)Values[Index].val; + vci->Set(&val, sizeof(int)); + } break; - case DT_BOOLEAN: - *val_i = ConfValueBool(this->config_data, Values[Index].tag, Values[Index].value, 0); + { + bool val = vi.GetBool(); + ValueContainerBool* vcb = (ValueContainerBool*)Values[Index].val; + vcb->Set(&val, sizeof(bool)); + } break; - - case DT_NOTHING: + default: + /* You don't want to know what happens if someones bad code sends us here. */ break; } - Values[Index].validation_function(Values[Index].tag, Values[Index].value, Values[Index].val); + /* We're done with this now */ + delete Values[Index].val; } - /* Claim memory for use when reading multiple tags - */ - for (int n = 0; n < 12; n++) - data[n] = new char[MAXBUF]; - /* 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. */ - - /* XXX - Make this use ConfValueInteger and so on */ for (int Index = 0; MultiValues[Index].tag; Index++) { - MultiValues[Index].init_function(MultiValues[Index].tag); + 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++) { - ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, data[valuenum], MAXBUF); - switch (MultiValues[Index].datatype[valuenum]) { case DT_CHARPTR: - ptr[valuenum] = data[valuenum]; + { + char item[MAXBUF]; + ConfValue(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item, MAXBUF); + vl.push_back(ValueItem(item)); + } break; case DT_INTEGER: - r_i[valuenum] = atoi(data[valuenum]); - ptr[valuenum] = &r_i[valuenum]; + { + int item; + ConfValueInteger(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum, item); + vl.push_back(ValueItem(item)); + } break; case DT_BOOLEAN: - r_i[valuenum] = ((*data[valuenum] == tolower('y')) || (*data[valuenum] == tolower('t')) || (*data[valuenum] == '1')); - ptr[valuenum] = &r_i[valuenum]; + { + bool item = ConfValueBool(this->config_data, MultiValues[Index].tag, MultiValues[Index].items[valuenum], tagnum); + vl.push_back(ValueItem(item)); + } break; default: + /* Someone was smoking craq if we got here, and we're all gonna die. */ break; } } - MultiValues[Index].validation_function(MultiValues[Index].tag, (char**)MultiValues[Index].items, ptr, MultiValues[Index].datatype); + + MultiValues[Index].validation_function(this, MultiValues[Index].tag, (char**)MultiValues[Index].items, vl, MultiValues[Index].datatype); } - MultiValues[Index].finish_function(MultiValues[Index].tag); + MultiValues[Index].finish_function(this, MultiValues[Index].tag); } - /* Free any memory we claimed - */ - for (int n = 0; n < 12; n++) - delete[] data[n]; - // write once here, to try it out and make sure its ok - ServerInstance->WritePID(Config->PID); + ServerInstance->WritePID(this->PID); - log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); + ServerInstance->Log(DEFAULT,"Done reading configuration file."); /* If we're rehashing, let's load any new modules, and unload old ones */ if (!bail) { - ServerInstance->stats->BoundPortCount = BindPorts(false); + int found_ports = 0; + FailedPortList pl; + ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports, pl); + + if (pl.size()) + { + 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, found_ports - ServerInstance->stats->BoundPortCount != 1 ? "s" : ""); + 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); + } + } if (!removed_modules.empty()) + { for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { if (ServerInstance->UnloadModule(removing->c_str())) { - WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); + ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); if (user) - WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); + user->WriteServ("973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str()); rem++; } else { if (user) - WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError()); + user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError()); } } + } if (!added_modules.empty()) - for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (ServerInstance->LoadModule(adding->c_str())) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); - - if (user) - WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str()); - - add++; - } - else - { - if (user) - WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + if (ServerInstance->LoadModule(adding->c_str())) + { + 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()); + + add++; + } + else + { + if (user) + user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + } } } - 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()); + 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()); } } @@ -906,11 +966,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if ((ch == '\\') && (in_quote) && (in_tag)) { line += ch; - log(DEBUG,"Escape sequence in config line."); + ServerInstance->Log(DEBUG,"Escape sequence in config line."); char real_character; if (conf.get(real_character)) { - log(DEBUG,"Escaping %c", real_character); + ServerInstance->Log(DEBUG,"Escaping %c", real_character); + if (real_character == 'n') + real_character = '\n'; line += real_character; continue; } @@ -1075,7 +1137,10 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin if ((*c == '\\') && (in_quote)) { c++; - current_value += *c; + if (*c == 'n') + current_value += '\n'; + else + current_value += *c; continue; } if (*c == '"') @@ -1185,11 +1250,11 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con } else if(pos == 0) { - log(DEBUG, "No <%s> tags in config file.", tag.c_str()); + ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str()); } else { - log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); + ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); } return false; @@ -1255,12 +1320,231 @@ int ServerConfig::ConfVarEnum(ConfigDataHash &target, const std::string &tag, in } else if(pos == 0) { - log(DEBUG, "No <%s> tags in config file.", tag.c_str()); + ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str()); } else { - log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); + ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str()); } return 0; } + +/** Read the contents of a file located by `fname' into a file_cache pointed at by `F'. + */ +bool ServerConfig::ReadFile(file_cache &F, const char* fname) +{ + FILE* file = NULL; + char linebuf[MAXBUF]; + + F.clear(); + + if (*fname != '/') + { + std::string::size_type pos; + std::string confpath = CONFIG_FILE; + if((pos = confpath.find("/inspircd.conf")) != std::string::npos) + { + /* Leaves us with just the path */ + std::string newfile = confpath.substr(0, pos) + std::string("/") + fname; + file = fopen(newfile.c_str(), "r"); + + } + } + else + file = fopen(fname, "r"); + + if (file) + { + while (!feof(file)) + { + if (fgets(linebuf, sizeof(linebuf), file)) + linebuf[strlen(linebuf)-1] = 0; + else + *linebuf = 0; + + if (!feof(file)) + { + F.push_back(*linebuf ? linebuf : " "); + } + } + + fclose(file); + } + else + return false; + + return true; +} + +bool ServerConfig::FileExists(const char* file) +{ + FILE *input; + if ((input = fopen (file, "r")) == NULL) + { + return false; + } + else + { + fclose(input); + return true; + } +} + +char* ServerConfig::CleanFilename(char* name) +{ + char* p = name + strlen(name); + while ((p != name) && (*p != '/')) p--; + return (p != name ? ++p : p); +} + + +bool ServerConfig::DirValid(const char* dirandfile) +{ + char work[MAXBUF]; + char buffer[MAXBUF]; + char otherdir[MAXBUF]; + int p; + + strlcpy(work, dirandfile, MAXBUF); + p = strlen(work); + + // we just want the dir + while (*work) + { + if (work[p] == '/') + { + work[p] = '\0'; + break; + } + + work[p--] = '\0'; + } + + // Get the current working directory + if (getcwd(buffer, MAXBUF ) == NULL ) + return false; + + if (chdir(work) == -1) + return false; + + if (getcwd(otherdir, MAXBUF ) == NULL ) + return false; + + if (chdir(buffer) == -1) + return false; + + size_t t = strlen(work); + + if (strlen(otherdir) >= t) + { + otherdir[t] = '\0'; + + if (!strcmp(otherdir,work)) + { + return true; + } + + return false; + } + else + { + return false; + } +} + +std::string ServerConfig::GetFullProgDir(char** argv, int argc) +{ + char work[MAXBUF]; + char buffer[MAXBUF]; + char otherdir[MAXBUF]; + int p; + + strlcpy(work,argv[0],MAXBUF); + p = strlen(work); + + // we just want the dir + while (*work) + { + if (work[p] == '/') + { + work[p] = '\0'; + break; + } + + work[p--] = '\0'; + } + + // Get the current working directory + if (getcwd(buffer, MAXBUF) == NULL) + return ""; + + if (chdir(work) == -1) + return ""; + + if (getcwd(otherdir, MAXBUF) == NULL) + return ""; + + if (chdir(buffer) == -1) + return ""; + + return otherdir; +} + +InspIRCd* ServerConfig::GetInstance() +{ + return ServerInstance; +} + + +ValueItem::ValueItem(int value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +ValueItem::ValueItem(bool value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +ValueItem::ValueItem(char* value) +{ + v = value; +} + +void ValueItem::Set(char* value) +{ + v = value; +} + +void ValueItem::Set(const char* value) +{ + v = value; +} + +void ValueItem::Set(int value) +{ + std::stringstream n; + n << value; + v = n.str(); +} + +int ValueItem::GetInteger() +{ + return atoi(v.c_str()); +} + +char* ValueItem::GetString() +{ + return (char*)v.c_str(); +} + +bool ValueItem::GetBool() +{ + return (GetInteger() || v == "yes" || v == "true"); +} +