X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd_io.cpp;h=f4ab7ce071ea360ac33e41101015453cc51b528d;hb=bf3b7b4696115c5f90b9c2a7ea966d0f9d3eb394;hp=0cf28d3b8180dab02b7cd86201fa5e40eb9cffdb;hpb=c09e928d6dd87c1a2dea7347d2e97e0c7e30182f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp index 0cf28d3b8..f4ab7ce07 100644 --- a/src/inspircd_io.cpp +++ b/src/inspircd_io.cpp @@ -2,10 +2,10 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * - * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see @@ -25,42 +25,807 @@ using namespace std; #include #include #include +#include "message.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" #include "inspstring.h" #include "helperfuncs.h" +#include "userprocess.h" +#include "xline.h" -extern FILE *log_file; -extern int boundPortCount; +extern ServerConfig *Config; +extern InspIRCd* ServerInstance; extern int openSockfd[MAXSOCKS]; extern time_t TIME; -extern bool unlimitcore; -extern int MaxConn; -std::vector include_stack; -void WriteOpers(char* text, ...); +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() +{ + this->ClearStack(); + *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0'; + *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0'; + *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; + *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0'; + log_file = NULL; + nofork = HideBans = HideSplits = unlimitcore = false; + AllowHalfop = true; + dns_timeout = DieDelay = 5; + MaxTargets = 20; + NetBufferSize = 10240; + SoftLimit = MAXCLIENTS; + MaxConn = SOMAXCONN; + MaxWhoResults = 100; + debugging = 0; + LogLevel = DEFAULT; + maxbans.clear(); +} + +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); +} + +bool ServerConfig::AddIOHook(int port, Module* iomod) +{ + if (!GetIOHook(port)) + { + IOHookModule[port] = iomod; + return true; + } + else + { + ModuleException err("Port already hooked by another module"); + throw(err); + return false; + } +} + +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::CheckOnce(char* tag, bool bail, userrec* user) +{ + int count = ConfValueEnum(tag,&Config->config_f); + 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); + } + 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); + } + else + { + WriteOpers("There were errors in the configuration file:"); + WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag); + } + } + return false; + } + if (count < 1) + { + if (bail) + { + printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag); + Exit(0); + } + 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); + } + else + { + WriteOpers("There were errors in the configuration file:"); + WriteOpers("You have not defined a <%s> tag, this is required.",tag); + } + } + return false; + } + return true; +} + +bool NoValidation(const char* tag, const char* value, void* data) +{ + log(DEBUG,"No validation for <%s:%s>",tag,value); + return true; +} + +bool ValidateTempDir(const char* tag, const char* value, void* data) +{ + char* x = (char*)data; + if (!*x) + strlcpy(x,"/tmp",1024); + return true; +} + +bool ValidateMaxTargets(const char* tag, const char* value, void* data) +{ + int* x = (int*)data; + if ((*x < 0) || (*x > 31)) + { + log(DEFAULT,"WARNING: value is greater than 31 or less than 0, set to 20."); + *x = 20; + } + return true; +} + +bool ValidateSoftLimit(const char* tag, const char* value, void* 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; + } + return true; +} + +bool ValidateMaxConn(const char* tag, const char* value, void* 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; + return true; +} + +bool ValidateDnsTimeout(const char* tag, const char* value, void* data) +{ + int* x = (int*)data; + if (!*x) + *x = 5; + return true; +} + +bool ValidateDnsServer(const char* tag, const char* value, void* data) +{ + char* x = (char*)data; + if (!*x) + { + // attempt to look up their nameserver from /etc/resolv.conf + 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; + + if (resolv.is_open()) + { + while (resolv >> nameserver) + { + if ((nameserver == "nameserver") && (!found_server)) + { + resolv >> nameserver; + strlcpy(x,nameserver.c_str(),MAXBUF); + found_server = true; + 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); + } + } + else + { + log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); + strlcpy(x,"127.0.0.1",MAXBUF); + } + } + return true; +} + +bool ValidateModPath(const char* tag, const char* value, void* data) +{ + char* x = (char*)data; + if (!*x) + strlcpy(x,MOD_PATH,MAXBUF); + return true; +} + + +bool ValidateServerName(const char* tag, const char* value, void* data) +{ + char* x = (char*)data; + if (!strchr(x,'.')) + { + log(DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.'); + charlcat(x,'.',MAXBUF); + } + //strlower(x); + return true; +} + +bool ValidateNetBufferSize(const char* tag, const char* value, void* data) +{ + if ((!Config->NetBufferSize) || (Config->NetBufferSize > 65535) || (Config->NetBufferSize < 1024)) + { + log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240."); + Config->NetBufferSize = 10240; + } + return true; +} + +bool ValidateMaxWho(const char* tag, const char* value, void* data) +{ + if ((!Config->MaxWhoResults) || (Config->MaxWhoResults > 65535) || (Config->MaxWhoResults < 1)) + { + log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128."); + Config->MaxWhoResults = 128; + } + return true; +} + +bool ValidateLogLevel(const char* tag, const char* value, void* 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; + return true; +} + +bool ValidateMotd(const char* tag, const char* value, void* data) +{ + readfile(Config->MOTD,Config->motd); + return true; +} + +bool ValidateRules(const char* tag, const char* value, void* data) +{ + readfile(Config->RULES,Config->rules); + return true; +} + +/* Callback called before processing the first tag + */ +bool InitConnect(const char* tag) +{ + log(DEFAULT,"Reading connect classes..."); + Config->Classes.clear(); + return true; +} + +/* Callback called to process a single tag + */ +bool DoConnect(const char* tag, char** entries, void** 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]; + + 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; + + + if (c.maxlocal == 0) + c.maxlocal = 3; + if (c.maxglobal == 0) + c.maxglobal = 3; + if (c.threshold == 0) + { + 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()); + } + if (c.sendqmax == 0) + c.sendqmax = 262114; + if (c.recvqmax == 0) + c.recvqmax = 4096; + if (c.registration_timeout == 0) + c.registration_timeout = 90; + if (c.pingtime == 0) + c.pingtime = 120; + Config->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); + } + + return true; +} + +/* Callback called when there are no more tags + */ +bool DoneConnect(const char* tag) +{ + log(DEBUG,"DoneConnect called for tag: %s",tag); + return true; +} + +/* Callback called before processing the first tag + */ +bool InitULine(const char* tag) +{ + Config->ulines.clear(); + return true; +} + +/* Callback called to process a single tag + */ +bool DoULine(const char* tag, char** entries, void** values, int* types) +{ + char* server = (char*)values[0]; + log(DEBUG,"Read ULINE '%s'",server); + Config->ulines.push_back(server); + return true; +} + +/* Callback called when there are no more tags + */ +bool DoneULine(const char* tag) +{ + return true; +} + +/* Callback called before processing the first tag + */ +bool InitModule(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++) + { + old_module_names.push_back(*t); + } + return true; +} + +/* Callback called to process a single tag + */ +bool DoModule(const char* tag, char** entries, void** values, int* types) +{ + char* modname = (char*)values[0]; + new_module_names.push_back(modname); + return true; +} + +/* Callback called when there are no more tags + */ +bool DoneModule(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 + for (std::vector::iterator _new = new_module_names.begin(); _new != new_module_names.end(); _new++) + { + bool added = true; + + for (std::vector::iterator old = old_module_names.begin(); old != old_module_names.end(); old++) + { + if (*old == *_new) + added = false; + } + + if (added) + added_modules.push_back(*_new); + } + + for (std::vector::iterator oldm = old_module_names.begin(); oldm != old_module_names.end(); oldm++) + { + bool removed = true; + for (std::vector::iterator newm = new_module_names.begin(); newm != new_module_names.end(); newm++) + { + if (*newm == *oldm) + removed = false; + } + + if (removed) + removed_modules.push_back(*oldm); + } + return true; +} + +/* Callback called before processing the first tag + */ +bool InitMaxBans(const char* tag) +{ + Config->maxbans.clear(); + return true; +} + +/* Callback called to process a single tag + */ +bool DoMaxBans(const char* tag, char** entries, void** values, int* types) +{ + char* channel = (char*)values[0]; + int* limit = (int*)values[1]; + Config->maxbans[channel] = *limit; + return true; +} + +/* Callback called when there are no more tags. + */ +bool DoneMaxBans(const char* tag) +{ + return true; +} + +void ServerConfig::Read(bool bail, userrec* user) +{ + char debug[MAXBUF]; /* Temporary buffer for debugging value */ + char dataline[1024]; /* Temporary buffer for error output */ + char* convert; /* Temporary buffer used for reading singular values into */ + 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 */ + int rem = 0, add = 0; /* Number of modules added, number of modules removed */ + std::stringstream 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 }; + + /* 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", "tempdir", &this->TempDir, DT_CHARPTR, ValidateTempDir}, + {"pid", "file", &this->PID, 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[] = { + + {"connect", + {"allow", "deny", "password", "timeout", "pingfreq", "flood", + "threshold", "sendq", "recvq", "localmax", "globalmax", NULL}, + {DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER}, + InitConnect, DoConnect, DoneConnect}, + + {"uline", + {"server", NULL}, + {DT_CHARPTR}, + InitULine,DoULine,DoneULine}, + + {"banlist", + {"chan", "limit", NULL}, + {DT_CHARPTR, DT_INTEGER}, + InitMaxBans, DoMaxBans, DoneMaxBans}, + + {"module", + {"name", NULL}, + {DT_CHARPTR}, + InitModule, DoModule, DoneModule}, + + {"badip", + {"reason", "ipmask", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoZLine, DoneXLine}, + + {"badnick", + {"reason", "nick", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoQLine, DoneXLine}, + + {"badhost", + {"reason", "host", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoKLine, DoneXLine}, + + {"exception", + {"reason", "host", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitXLine, DoELine, DoneXLine}, + + {"type", + {"name", "classes", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitTypes, DoType, DoneClassesAndTypes}, + + {"class", + {"name", "commands", NULL}, + {DT_CHARPTR, DT_CHARPTR}, + InitClasses, DoClass, DoneClassesAndTypes}, + + {NULL} + }; + + include_stack.clear(); + + /* Initially, load the config into memory, bail if there are errors + */ + if (!LoadConf(CONFIG_FILE,&Config->config_f,&errstr)) + { + errstr.seekg(0); + log(DEFAULT,"There were errors in your configuration:\n%s",errstr.str().c_str()); + + if (bail) + { + printf("There were errors in your configuration:\n%s",errstr.str().c_str()); + Exit(0); + } + else + { + if (user) + { + WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick); + while (!errstr.eof()) + { + errstr.getline(dataline,1024); + WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline); + } + } + else + { + WriteOpers("There were errors in the configuration file:"); + while (!errstr.eof()) + { + errstr.getline(dataline,1024); + WriteOpers(dataline); + } + } + + return; + } + } + + /* 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)) + 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; + + switch (Values[Index].datatype) + { + case DT_CHARPTR: + ConfValue(Values[Index].tag, Values[Index].value, 0, val_c, &this->config_f); + break; + + case DT_INTEGER: + convert = new char[MAXBUF]; + ConfValue(Values[Index].tag, Values[Index].value, 0, convert, &this->config_f); + *val_i = atoi(convert); + delete[] convert; + break; + + case DT_BOOLEAN: + convert = new char[MAXBUF]; + ConfValue(Values[Index].tag, Values[Index].value, 0, convert, &this->config_f); + *val_i = ((*convert == tolower('y')) || (*convert == tolower('t')) || (*convert == '1')); + delete[] convert; + break; + + case DT_NOTHING: + break; + } + + Values[Index].validation_function(Values[Index].tag, Values[Index].value, 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. + */ + for (int Index = 0; MultiValues[Index].tag; Index++) + { + MultiValues[Index].init_function(MultiValues[Index].tag); + + int number_of_tags = ConfValueEnum((char*)MultiValues[Index].tag, &this->config_f); + + for (int tagnum = 0; tagnum < number_of_tags; tagnum++) + { + for (int valuenum = 0; MultiValues[Index].items[valuenum]; valuenum++) + { + ConfValue((char*)MultiValues[Index].tag,(char*)MultiValues[Index].items[valuenum], tagnum, data[valuenum], &this->config_f); + + switch (MultiValues[Index].datatype[valuenum]) + { + case DT_CHARPTR: + ptr[valuenum] = data[valuenum]; + break; + case DT_INTEGER: + r_i[valuenum] = atoi(data[valuenum]); + ptr[valuenum] = &r_i[valuenum]; + break; + case DT_BOOLEAN: + r_i[valuenum] = ((*data[valuenum] == tolower('y')) || (*data[valuenum] == tolower('t')) || (*data[valuenum] == '1')); + ptr[valuenum] = &r_i[valuenum]; + break; + default: + break; + } + } + MultiValues[Index].validation_function(MultiValues[Index].tag, (char**)MultiValues[Index].items, ptr, MultiValues[Index].datatype); + } + + MultiValues[Index].finish_function(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 + WritePID(Config->PID); + + log(DEFAULT,"Done reading configuration file, InspIRCd is now starting."); + + /* If we're rehashing, let's load any new modules, and unload old ones + */ + if (!bail) + { + 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()); + + if (user) + WriteServ(user->fd,"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()); + } + } + + if (!added_modules.empty()) + for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) + { + if (ServerInstance->LoadModule(adding->c_str())) + { + 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()); + } + } + + 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()); + } +} void Exit (int status) { - if (log_file) - fclose(log_file); + if (Config->log_file) + fclose(Config->log_file); send_error("Server shutdown."); exit (status); } void Killed(int status) { - if (log_file) - fclose(log_file); + if (Config->log_file) + fclose(Config->log_file); send_error("Server terminated."); exit(status); } +char* CleanFilename(char* name) +{ + char* p = name + strlen(name); + while ((p != name) && (*p != '/')) p--; + return (p != name ? ++p : p); +} + + void Rehash(int status) { - WriteOpers("Rehashing config file %s due to SIGHUP",CONFIG_FILE); - ReadConfig(false,NULL); + WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE)); + fclose(Config->log_file); + OpenLog(NULL,0); + Config->Read(false,NULL); + FOREACH_MOD(I_OnRehash,OnRehash("")); } @@ -69,13 +834,12 @@ void Start (void) { printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); printf("(C) ChatSpike Development team.\033[0m\n\n"); - printf("Developers:\033[1;32m Brain, FrostyCoolSlug\033[0m\n"); - printf("Documentation:\033[1;32m FrostyCoolSlug, w00t\033[0m\n"); - printf("Testers:\033[1;32m typobox43, piggles, Lord_Zathras, CC\033[0m\n"); - printf("Name concept:\033[1;32m Lord_Zathras\033[0m\n\n"); + printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om\033[0m\n"); + printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); + printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n"); } -void WritePID(std::string filename) +void WritePID(const std::string &filename) { ofstream outfile(filename.c_str()); if (outfile.is_open()) @@ -91,28 +855,32 @@ void WritePID(std::string filename) } } - -int DaemonSeed (void) +void SetSignals() { - int childpid; signal (SIGALRM, SIG_IGN); signal (SIGHUP, Rehash); signal (SIGPIPE, SIG_IGN); signal (SIGTERM, Exit); signal (SIGSEGV, Error); +} + + +int DaemonSeed (void) +{ + int childpid; if ((childpid = fork ()) < 0) return (ERROR); else if (childpid > 0) + { + /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */ + sleep(6); exit (0); + } setsid (); umask (007); printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); - freopen("/dev/null","w",stdout); - freopen("/dev/null","w",stderr); - - setpriority(PRIO_PROCESS,(int)getpid(),15); - if (unlimitcore) + if (Config->unlimitcore) { rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) @@ -155,89 +923,92 @@ bool FileExists (const char* file) /* ConfProcess does the following things to a config line in the following order: * * Processes the line for syntax errors as shown below - * (1) Line void of quotes or equals (a malformed, illegal tag format) - * (2) Odd number of quotes on the line indicating a missing quote - * (3) number of equals signs not equal to number of quotes / 2 (missing an equals sign) - * (4) Spaces between the opening bracket (<) and the keyword - * (5) Spaces between a keyword and an equals sign - * (6) Spaces between an equals sign and a quote + * (1) Line void of quotes or equals (a malformed, illegal tag format) + * (2) Odd number of quotes on the line indicating a missing quote + * (3) number of equals signs not equal to number of quotes / 2 (missing an equals sign) + * (4) Spaces between the opening bracket (<) and the keyword + * (5) Spaces between a keyword and an equals sign + * (6) Spaces between an equals sign and a quote * Removes trailing spaces * Removes leading spaces * Converts tabs to spaces * Turns multiple spaces that are outside of quotes into single spaces */ -std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errorstream, bool &error, std::string filename) +std::string ServerConfig::ConfProcess(char* buffer, long linenumber, std::stringstream* errorstream, bool &error, std::string filename) { long number_of_quotes = 0; long number_of_equals = 0; bool has_open_bracket = false; bool in_quotes = false; + char* trailing; + error = false; if (!buffer) { return ""; } // firstly clean up the line by stripping spaces from the start and end and converting tabs to spaces - for (unsigned int d = 0; d < strlen(buffer); d++) - if ((buffer[d]) == 9) - buffer[d] = ' '; - while ((buffer[0] == ' ') && (strlen(buffer)>0)) buffer++; - while ((buffer[strlen(buffer)-1] == ' ') && (strlen(buffer)>0)) buffer[strlen(buffer)-1] = '\0'; + for (char* d = buffer; *d; d++) + if (*d == 9) + *d = ' '; + while (*buffer == ' ') buffer++; + trailing = buffer + strlen(buffer) - 1; + while (*trailing == ' ') *trailing-- = '\0'; // empty lines are syntactically valid, as are comments if (!(*buffer) || buffer[0] == '#') return ""; - for (unsigned int c = 0; c < strlen(buffer); c++) + for (char* c = buffer; *c; c++) { // convert all spaces that are OUTSIDE quotes into hardspace (0xA0) as this will make them easier to // search and replace later :) - if ((!in_quotes) && (buffer[c] == ' ')) - buffer[c] = '\xA0'; - if ((buffer[c] == '<') && (!in_quotes)) + if ((!in_quotes) && (*c == ' ')) + *c = '\xA0'; + if ((*c == '<') && (!in_quotes)) { has_open_bracket = true; - if (strlen(buffer) == 1) + if (!(*(buffer+1))) { *errorstream << "Tag without identifier at " << filename << ":" << linenumber << endl; error = true; return ""; } - else if ((tolower(buffer[c+1]) < 'a') || (tolower(buffer[c+1]) > 'z')) + else if ((tolower(*(c+1)) < 'a') || (tolower(*(c+1)) > 'z')) { *errorstream << "Invalid characters in identifier at " << filename << ":" << linenumber << endl; error = true; return ""; } } - if (buffer[c] == '"') + if (*c == '"') { number_of_quotes++; in_quotes = (!in_quotes); } - if ((buffer[c] == '=') && (!in_quotes)) + if ((*c == '=') && (!in_quotes)) { number_of_equals++; - if (strlen(buffer) == c) + if (*(c+1) == 0) { *errorstream << "Variable without a value at " << filename << ":" << linenumber << endl; error = true; return ""; } - else if (buffer[c+1] != '"') + else if (*(c+1) != '"') { *errorstream << "Variable name not followed immediately by its value at " << filename << ":" << linenumber << endl; error = true; return ""; } - else if (!c) + else if (c == buffer) { *errorstream << "Value without a variable (line starts with '=') at " << filename << ":" << linenumber << endl; error = true; return ""; } - else if (buffer[c-1] == '\xA0') + else if (*(c-1) == '\xA0') { *errorstream << "Variable name not followed immediately by its value at " << filename << ":" << linenumber << endl; error = true; @@ -246,7 +1017,7 @@ std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errors } } // no quotes, and no equals. something freaky. - if ((!number_of_quotes) || (!number_of_equals) && (strlen(buffer)>2) && (buffer[0]=='<')) + if ((!number_of_quotes) || (!number_of_equals) && (strlen(buffer)>2) && (*buffer == '<')) { *errorstream << "Malformed tag at " << filename << ":" << linenumber << endl; error = true; @@ -286,23 +1057,25 @@ std::string ConfProcess(char* buffer, long linenumber, std::stringstream* errors return parsedata; } -/* A special version of fgets that will read \r, \n, \r\n or even \n\r, it doesnt care :-) */ - -int fgets_safe(char* buffer, size_t maxsize, FILE* &file) +int ServerConfig::fgets_safe(char* buffer, size_t maxsize, FILE* &file) { - char c_read = '\0'; - unsigned int bufptr = 0; - while ((!feof(file)) && (c_read != '\n') && (c_read != '\r') && (bufptr < maxsize)) + char c_read = 0; + size_t n = 0; + char* bufptr = buffer; + while ((!feof(file)) && (c_read != '\n') && (c_read != '\r') && (n < maxsize)) { c_read = fgetc(file); if ((c_read != '\n') && (c_read != '\r')) - buffer[bufptr++] = c_read; + { + *bufptr++ = c_read; + n++; + } } - buffer[bufptr] = '\0'; - return bufptr; + *bufptr = 0; + return bufptr - buffer; } -bool LoadConf(const char* filename, std::stringstream *target, std::stringstream* errorstream) +bool ServerConfig::LoadConf(const char* filename, std::stringstream *target, std::stringstream* errorstream) { target->str(""); errorstream->str(""); @@ -331,10 +1104,9 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream { while (!feof(conf)) { - *buffer = 0; if (fgets_safe(buffer, MAXBUF, conf)) { - if ((buffer) && (strlen(buffer)) && (*buffer > '\r')) + if ((!feof(conf)) && (buffer) && (*buffer)) { if ((buffer[0] != '#') && (buffer[0] != '\r') && (buffer[0] != '\n')) { @@ -344,17 +1116,17 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream char confpath[10240],newconf[10240]; // include file directive buf += 15; // advance to filename - for (unsigned int j = 0; j < strlen(buf); j++) + for (char* j = buf; *j; j++) { - if (buf[j] == '\\') - buf[j] = '/'; - if (buf[j] == '"') + if (*j == '\\') + *j = '/'; + if (*j == '"') { - buf[j] = '\0'; + *j = 0; break; } } - log(DEFAULT,"Opening included file '%s'",buf); + log(DEBUG,"Opening included file '%s'",buf); if (*buf != '/') { strlcpy(confpath,CONFIG_FILE,10240); @@ -365,7 +1137,7 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream } snprintf(newconf,10240,"%s/%s",confpath,buf); } - else snprintf(newconf,10240,"%s",buf); + else strlcpy(newconf,buf,10240); std::stringstream merge(stringstream::in | stringstream::out); // recursively call LoadConf and get the new data, use the same errorstream if (LoadConf(newconf, &merge, errorstream)) @@ -385,7 +1157,7 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream else { bool error = false; - std::string data = ConfProcess(buffer,linenumber++,errorstream,error,filename); + std::string data = this->ConfProcess(buffer,linenumber++,errorstream,error,filename); if (error) { return false; @@ -405,30 +1177,30 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream /* Counts the number of tags of a certain type within the config file, e.g. to enumerate opers */ -int EnumConf(std::stringstream *config, const char* tag) +int ServerConfig::EnumConf(std::stringstream *config, const char* tag) { int ptr = 0; char buffer[MAXBUF], c_tag[MAXBUF], c, lastc; int in_token, in_quotes, tptr, idx = 0; - const char* buf = config->str().c_str(); - long bptr = 0; - long len = strlen(buf); + std::string x = config->str(); + const char* buf = x.c_str(); + char* bptr = (char*)buf; ptr = 0; in_token = 0; in_quotes = 0; lastc = '\0'; - while (bptrstr().c_str(); - long bptr = 0; - long len = strlen(buf); - + char* bptr = (char*)buf; + ptr = 0; in_token = 0; in_quotes = 0; - lastc = '\0'; - while (bptrstr().c_str(); - long bptr = 0; - long len = config->str().length(); + std::string x = config->str(); + const char* buf = x.c_str(); + char* bptr = (char*)buf; ptr = 0; in_token = 0; in_quotes = 0; - lastc = '\0'; - c_tag[0] = '\0'; - buffer[0] = '\0'; - while (bptr '%s'",addr,resolved_addr); + server.sin_addr = addy; + resolved = true; + } + else + { + log(DEFAULT,"WARNING: Could not resolve '%s' to an IP for binding to on port %d",addr,port); + return(FALSE); + } } - else + server.sin_family = AF_INET; + if (!resolved) { - server.sin_addr = addy; + if (!*addr) + { + server.sin_addr.s_addr = htonl(INADDR_ANY); + } + else + { + server.sin_addr = addy; + } } server.sin_port = htons(port); - if (bind(sockfd,(struct sockaddr*)&server,sizeof(server))<0) + if (bind(sockfd,(struct sockaddr*)&server,sizeof(server)) < 0) { return(ERROR); } else { - listen(sockfd, MaxConn); - return(TRUE); + log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); + if (listen(sockfd, Config->MaxConn) == -1) + { + log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); + return(FALSE); + } + else + { + return(TRUE); + } } } @@ -739,3 +1539,66 @@ int OpenTCPSocket (void) } } +int BindPorts() +{ + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + sockaddr_in client,server; + int clientportcount = 0; + int BoundPortCount = 0; + + for (int count = 0; count < Config->ConfValueEnum("bind",&Config->config_f); count++) + { + Config->ConfValue("bind","port",count,configToken,&Config->config_f); + Config->ConfValue("bind","address",count,Addr,&Config->config_f); + Config->ConfValue("bind","type",count,Type,&Config->config_f); + + if ((!*Type) || (!strcmp(Type,"clients"))) + { + // modules handle server bind types now + Config->ports[clientportcount] = atoi(configToken); + + // If the client put bind "*", this is an unrealism. + // We don't actually support this as documented, but + // i got fed up of people trying it, so now it converts + // it to an empty string meaning the same 'bind to all'. + if (*Addr == '*') + *Addr = 0; + + strlcpy(Config->addrs[clientportcount],Addr,256); + clientportcount++; + log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); + } + } + + int PortCount = clientportcount; + + for (int count = 0; count < PortCount; count++) + { + if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR) + { + log(DEBUG,"InspIRCd: startup: bad fd %lu binding port [%s:%d]",(unsigned long)openSockfd[BoundPortCount],Config->addrs[count],(unsigned long)Config->ports[count]); + return(ERROR); + } + + if (BindSocket(openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]) == ERROR) + { + log(DEFAULT,"InspIRCd: startup: failed to bind port [%s:%lu]: %s",Config->addrs[count],(unsigned long)Config->ports[count],strerror(errno)); + } + else + { + /* well we at least bound to one socket so we'll continue */ + BoundPortCount++; + } + } + + /* if we didn't bind to anything then abort */ + if (!BoundPortCount) + { + log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); + printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)PortCount); + return (ERROR); + } + + return BoundPortCount; +} +