X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=98092f57e9a1d434c515a6360c709ed8016b3b7c;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=bb22db3b16b75faf598cdf5fb4a8f1698eb3c353;hpb=51c06dcf84c255d60c576bd19c0e01048f4c40d5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index bb22db3b1..98092f57e 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -12,8 +12,6 @@ */ #include "inspircd.h" -#include "configreader.h" -#include #include #include "xline.h" #include "exitcodes.h" @@ -21,12 +19,15 @@ std::vector old_module_names, new_module_names, added_modules, removed_modules; +/* Needs forward declaration */ +bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data); + ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) { this->ClearStack(); *ServerName = *Network = *ServerDesc = *AdminName = '\0'; *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = *FixedQuit = *HideKillsServer = '\0'; - *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; + *DefaultModes = *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0'; *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = *SuffixQuit = '\0'; WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0; log_file = NULL; @@ -37,12 +38,13 @@ ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance) NetBufferSize = 10240; SoftLimit = MAXCLIENTS; MaxConn = SOMAXCONN; - MaxWhoResults = 100; + MaxWhoResults = 0; debugging = 0; MaxChans = 20; OperMaxChans = 30; LogLevel = DEFAULT; maxbans.clear(); + DNSServerValidator = &ValidateDnsServer; } void ServerConfig::ClearStack() @@ -56,9 +58,9 @@ Module* ServerConfig::GetIOHook(int port) return (x != IOHookModule.end() ? x->second : NULL); } -Module* ServerConfig::GetIOHook(InspSocket* is) +Module* ServerConfig::GetIOHook(BufferedSocket* is) { - std::map::iterator x = SocketIOHookModule.find(is); + std::map::iterator x = SocketIOHookModule.find(is); return (x != SocketIOHookModule.end() ? x->second : NULL); } @@ -76,7 +78,7 @@ bool ServerConfig::AddIOHook(int port, Module* iomod) } } -bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is) +bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is) { if (!GetIOHook(is)) { @@ -86,7 +88,7 @@ bool ServerConfig::AddIOHook(Module* iomod, InspSocket* is) } else { - throw ModuleException("InspSocket derived class already hooked by another module"); + throw ModuleException("BufferedSocket derived class already hooked by another module"); return false; } } @@ -102,9 +104,9 @@ bool ServerConfig::DelIOHook(int port) return false; } -bool ServerConfig::DelIOHook(InspSocket* is) +bool ServerConfig::DelIOHook(BufferedSocket* is) { - std::map::iterator x = SocketIOHookModule.find(is); + std::map::iterator x = SocketIOHookModule.find(is); if (x != SocketIOHookModule.end()) { SocketIOHookModule.erase(x); @@ -129,7 +131,7 @@ void ServerConfig::Update005() char buf[MAXBUF]; snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str()); isupport.push_back(buf); - line5 = ""; + line5.clear(); token_counter = 0; } } @@ -141,13 +143,13 @@ void ServerConfig::Update005() } } -void ServerConfig::Send005(userrec* user) +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()); } -bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user) +bool ServerConfig::CheckOnce(char* tag, bool bail, User* user) { int count = ConfValueEnum(this->config_data, tag); @@ -202,13 +204,13 @@ bool InitializeDisabledCommands(const char* data, InspIRCd* ServerInstance) std::string thiscmd; /* Enable everything first */ - for (command_table::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++) + for (Commandable::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) { - command_table::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); + Commandable::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd); if (cm != ServerInstance->Parser->cmdlist.end()) { cm->second->Disable(true); @@ -222,12 +224,6 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V if (!*(data.GetString())) { std::string nameserver; -#ifdef WINDOWS - conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in the registry..."); - nameserver = FindNameServerWin(); - data.Set(nameserver.c_str()); - conf->GetInstance()->Log(DEFAULT," set to '%s' as first active resolver in registry.", nameserver.c_str()); -#else // 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"); @@ -257,7 +253,6 @@ bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, V conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!"); data.Set("127.0.0.1"); } -#endif } return true; } @@ -292,9 +287,9 @@ bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* valu bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { - if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1)) + if ((data.GetInteger() > 65535) || (data.GetInteger() < 1)) { - conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128."); + conf->GetInstance()->Log(DEFAULT," size out of range, setting to default of 128."); data.Set(128); } return true; @@ -356,6 +351,34 @@ bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* valu return true; } +bool ValidateInvite(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +{ + std::string v = data.GetString(); + + if (v == "ops") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_OPS; + else if (v == "all") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_ALL; + else if (v == "dynamic") + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_DYNAMIC; + else + conf->AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE; + + return true; +} + +bool ValidateSID(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) +{ + int sid = data.GetInteger(); + if ((sid > 999) || (sid < 0)) + { + 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); + } + return true; +} + bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data) { conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString()); @@ -372,7 +395,7 @@ bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, Valu conf->GetInstance()->Log(DEFAULT,"WARNING: value less than 3600, setting to default 3600"); } - command_t* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); + Command* whowas_command = conf->GetInstance()->Parser->GetHandler("WHOWAS"); if (whowas_command) { std::deque params; @@ -407,16 +430,41 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v int recvq = values[8].GetInteger(); int localmax = values[9].GetInteger(); int globalmax = values[10].GetInteger(); + int port = values[11].GetInteger(); + const char* name = values[12].GetString(); + const char* parent = values[13].GetString(); + int maxchans = values[14].GetInteger(); - if (*allow) + if (*parent) { - ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax); - conf->Classes.push_back(c); + /* Find 'parent' and inherit a new class from it, + * then overwrite any values that are set here + */ + for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) + { + if (item->GetName() == parent) + { + ConnectClass c(name, *item); + c.Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port); + conf->Classes.push_back(c); + } + } + throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found."); } else { - ConnectClass c(deny); - conf->Classes.push_back(c); + if (*allow) + { + ConnectClass c(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans); + c.SetPort(port); + conf->Classes.push_back(c); + } + else + { + ConnectClass c(name, deny); + c.SetPort(port); + conf->Classes.push_back(c); + } } return true; @@ -538,14 +586,14 @@ bool DoneMaxBans(ServerConfig* conf, const char* tag) return true; } -void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, userrec* user) +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()); if (bail) { /* Unneeded because of the ServerInstance->Log() aboive? */ printf("There were errors in your configuration:\n%s\n\n",errormessage.c_str()); - InspIRCd::Exit(EXIT_STATUS_CONFIG); + ServerInstance->Exit(EXIT_STATUS_CONFIG); } else { @@ -577,12 +625,13 @@ void ServerConfig::ReportConfigError(const std::string &errormessage, bool bail, } } -void ServerConfig::Read(bool bail, userrec* user) +void ServerConfig::Read(bool bail, User* user) { static char debug[MAXBUF]; /* Temporary buffer for debugging value */ static char maxkeep[MAXBUF]; /* Temporary buffer for WhoWasMaxKeep value */ static char hidemodes[MAXBUF]; /* Modes to not allow listing from users below halfop */ static char exemptchanops[MAXBUF]; /* Exempt channel ops from these modes */ + static char announceinvites[MAXBUF]; /* options:announceinvites setting */ int rem = 0, add = 0; /* Number of modules added, number of modules removed */ std::ostringstream errstr; /* String stream containing the error output */ @@ -593,9 +642,11 @@ void ServerConfig::Read(bool bail, userrec* user) 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_CHARPTR, ValidateServerName}, {"server", "description", "Configure Me", new ValueContainerChar (this->ServerDesc), DT_CHARPTR, NoValidation}, {"server", "network", "Network", new ValueContainerChar (this->Network), DT_CHARPTR, NoValidation}, + {"server", "id", "0", new ValueContainerInt (&this->sid), DT_INTEGER, 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}, @@ -611,7 +662,7 @@ void ServerConfig::Read(bool bail, userrec* user) {"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_CHARPTR, ValidateDnsServer}, + {"dns", "server", "", new ValueContainerChar (this->DNSServer), DT_CHARPTR, 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}, @@ -620,16 +671,18 @@ void ServerConfig::Read(bool bail, userrec* user) {"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_CHARPTR, NoValidation}, - {"options", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_CHARPTR, NoValidation}, + {"options", "hidekills", "", new ValueContainerChar (this->HideKillsServer), DT_CHARPTR, 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 ValueContainerBool (&this->AnnounceInvites), 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}, @@ -648,12 +701,15 @@ void ServerConfig::Read(bool bail, userrec* user) {"connect", {"allow", "deny", "password", "timeout", "pingfreq", "flood", "threshold", "sendq", "recvq", "localmax", "globalmax", "port", + "name", "parent", "maxchans", NULL}, {"", "", "", "", "120", "", "", "", "", "3", "3", "0", + "", "", "0", NULL}, {DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER, - DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER}, + DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, + DT_CHARPTR, DT_CHARPTR, DT_INTEGER}, InitConnect, DoConnect, DoneConnect}, {"uline", @@ -865,7 +921,7 @@ void ServerConfig::Read(bool bail, userrec* user) FailedPortList pl; ServerInstance->BindPorts(false, found_ports, pl); - if (pl.size()) + 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); @@ -880,7 +936,7 @@ void ServerConfig::Read(bool bail, userrec* user) { for (std::vector::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++) { - if (ServerInstance->UnloadModule(removing->c_str())) + if (ServerInstance->Modules->Unload(removing->c_str())) { ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str()); @@ -892,7 +948,7 @@ void ServerConfig::Read(bool bail, userrec* user) else { if (user) - user->WriteServ("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->Modules->LastError()); } } } @@ -901,7 +957,7 @@ void ServerConfig::Read(bool bail, userrec* user) { for (std::vector::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++) { - if (ServerInstance->LoadModule(adding->c_str())) + if (ServerInstance->Modules->Load(adding->c_str())) { ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str()); @@ -913,7 +969,7 @@ void ServerConfig::Read(bool bail, userrec* user) else { if (user) - user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError()); + user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError()); } } } @@ -921,6 +977,9 @@ void ServerConfig::Read(bool bail, userrec* user) ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size()); } + /** Note: This is safe, the method checks for user == NULL */ + ServerInstance->Parser->SetupCommandTable(user); + if (user) user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick); else @@ -936,6 +995,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o bool in_tag; bool in_quote; bool in_comment; + int character_count = 0; linenumber = 1; in_tag = false; @@ -965,8 +1025,23 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o include_stack.push_back(filename); /* Start reading characters... */ - while(conf.get(ch)) + while (conf.get(ch)) { + + /* + * Fix for moronic windows issue spotted by Adremelech. + * Some windows editors save text files as utf-16, which is + * a total pain in the ass to parse. Users should save in the + * right config format! If we ever see a file where the first + * byte is 0xFF or 0xFE, or the second is 0xFF or 0xFE, then + * this is most likely a utf-16 file. Bail out and insult user. + */ + if ((character_count++ < 2) && (ch == '\xFF' || ch == '\xFE')) + { + errorstream << "File " << filename << " cannot be read, as it is encoded in braindead UTF-16. Save your file as plain ASCII!" << std::endl; + return false; + } + /* * Here we try and get individual tags on separate lines, * this would be so easy if we just made people format @@ -976,16 +1051,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * no '>' then die with an error. */ - if((ch == '#') && !in_quote) + if ((ch == '#') && !in_quote) in_comment = true; - /*if(((ch == '\n') || (ch == '\r')) && in_quote) - { - errorstream << "Got a newline within a quoted section, this is probably a typo: " << filename << ":" << linenumber << std::endl; - return false; - }*/ - - switch(ch) + switch (ch) { case '\n': if (in_quote) @@ -1032,11 +1101,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o if (ch != '\r') line += ch; - if(ch == '<') + if (ch == '<') { - if(in_tag) + if (in_tag) { - if(!in_quote) + if (!in_quote) { errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl; return false; @@ -1044,7 +1113,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } else { - if(in_quote) + if (in_quote) { errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl; return false; @@ -1056,11 +1125,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } } - else if(ch == '"') + else if (ch == '"') { - if(in_tag) + if (in_tag) { - if(in_quote) + if (in_quote) { // errorstream << "Closing quote in config tag on line " << linenumber << std::endl; in_quote = false; @@ -1073,7 +1142,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } else { - if(in_quote) + if (in_quote) { errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl; } @@ -1083,11 +1152,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } } - else if(ch == '>') + else if (ch == '>') { - if(!in_quote) + if (!in_quote) { - if(in_tag) + if (in_tag) { // errorstream << "Closing config tag on line " << linenumber << std::endl; in_tag = false; @@ -1097,7 +1166,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o * LoadConf() and load the included config into the same ConfigDataHash */ - if(!this->ParseLine(target, line, linenumber, errorstream)) + if (!this->ParseLine(target, line, linenumber, errorstream)) return false; line.clear(); @@ -1111,6 +1180,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o } } + /* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */ + if (in_comment || in_quote) + { + errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \ + is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl; + } + return true; } @@ -1119,7 +1195,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename, return this->LoadConf(target, filename.c_str(), errorstream); } -bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream) +bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream) { std::string tagname; std::string current_key; @@ -1131,17 +1207,15 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin got_name = got_key = in_quote = false; - //std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl; - for(std::string::iterator c = line.begin(); c != line.end(); c++) { - if(!got_name) + if (!got_name) { /* We don't know the tag name yet. */ - if(*c != ' ') + if (*c != ' ') { - if(*c != '<') + if (*c != '<') { tagname += *c; } @@ -1194,6 +1268,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin { /* Got a 'real' \n, treat it as part of the value */ current_value += '\n'; + linenumber++; continue; } else if ((*c == '\r') && (in_quote)) @@ -1217,9 +1292,9 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin in_quote = false; got_key = false; - if((tagname == "include") && (current_key == "file")) + if ((tagname == "include") && (current_key == "file")) { - if(!this->DoInclude(target, current_value, errorstream)) + if (!this->DoInclude(target, current_value, errorstream)) return false; } @@ -1229,7 +1304,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin } else { - if(in_quote) + if (in_quote) { current_value += *c; } @@ -1472,19 +1547,20 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname) F.clear(); - if (*fname != '/') + if ((*fname != '/') && (*fname != '\\')) { std::string::size_type pos; std::string confpath = ServerInstance->ConfigFileName; - if((pos = confpath.rfind("/")) != std::string::npos) - { - /* Leaves us with just the path */ - std::string newfile = confpath.substr(0, pos) + std::string("/") + fname; - if (!FileExists(newfile.c_str())) - return false; - file = fopen(newfile.c_str(), "r"); + std::string newfile = fname; - } + if ((pos = confpath.rfind("/")) != std::string::npos) + newfile = confpath.substr(0, pos) + std::string("/") + fname; + else if ((pos = confpath.rfind("\\")) != std::string::npos) + newfile = confpath.substr(0, pos) + std::string("\\") + fname; + + if (!FileExists(newfile.c_str())) + return false; + file = fopen(newfile.c_str(), "r"); } else { @@ -1538,7 +1614,7 @@ bool ServerConfig::FileExists(const char* file) char* ServerConfig::CleanFilename(char* name) { char* p = name + strlen(name); - while ((p != name) && (*p != '/')) p--; + while ((p != name) && (*p != '/') && (*p != '\\')) p--; return (p != name ? ++p : p); } @@ -1602,20 +1678,37 @@ bool ServerConfig::DirValid(const char* dirandfile) std::string ServerConfig::GetFullProgDir() { - char buffer[1024]; - - // Get the current working directory - if (getcwd(buffer, 1024) == NULL) + char buffer[PATH_MAX+1]; +#ifdef WINDOWS + /* Windows has specific api calls to get the exe path that never fail. + * For once, windows has something of use, compared to the POSIX code + * for this, this is positively neato. + */ + if (GetModuleFileName(NULL, buffer, MAX_PATH)) { - return ""; + std::string fullpath = buffer; + std::string::size_type n = fullpath.rfind("\\inspircd.exe"); + return std::string(fullpath, 0, n); } - - if (chdir(buffer) == -1) +#else + // Get the current working directory + if (getcwd(buffer, PATH_MAX)) { - return ""; - } + std::string remainder = this->argv[0]; + + /* Does argv[0] start with /? its a full path, use it */ + if (remainder[0] == '/') + { + std::string::size_type n = remainder.rfind("/inspircd"); + return std::string(remainder, 0, n); + } - return buffer; + std::string fullpath = std::string(buffer) + "/" + remainder; + std::string::size_type n = fullpath.rfind("/inspircd"); + return std::string(fullpath, 0, n); + } +#endif + return "/"; } InspIRCd* ServerConfig::GetInstance() @@ -1623,6 +1716,14 @@ InspIRCd* ServerConfig::GetInstance() return ServerInstance; } +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; +} ValueItem::ValueItem(int value) { @@ -1677,3 +1778,73 @@ bool ValueItem::GetBool() return (GetInteger() || v == "yes" || v == "true"); } + + + +/* + * XXX should this be in a class? -- w00t + */ +bool InitTypes(ServerConfig* conf, const char* tag) +{ + if (conf->opertypes.size()) + { + for (opertype_t::iterator n = conf->opertypes.begin(); n != conf->opertypes.end(); n++) + { + if (n->second) + delete[] n->second; + } + } + + conf->opertypes.clear(); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool InitClasses(ServerConfig* conf, const char* tag) +{ + if (conf->operclass.size()) + { + for (operclass_t::iterator n = conf->operclass.begin(); n != conf->operclass.end(); n++) + { + if (n->second) + delete[] n->second; + } + } + + conf->operclass.clear(); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* TypeName = values[0].GetString(); + const char* Classes = values[1].GetString(); + + conf->opertypes[TypeName] = strnewdup(Classes); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) +{ + const char* ClassName = values[0].GetString(); + const char* CommandList = values[1].GetString(); + + conf->operclass[ClassName] = strnewdup(CommandList); + return true; +} + +/* + * XXX should this be in a class? -- w00t + */ +bool DoneClassesAndTypes(ServerConfig* conf, const char* tag) +{ + return true; +}