X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=98092f57e9a1d434c515a6360c709ed8016b3b7c;hb=4487dde76ffbdb21e7dc319b3b87d09c3cf60d8c;hp=b3258eb2ee1702d1532a1b53f56583a26301a2d3;hpb=cf4439ac5c5e5f57aba2c998ee63b9b27ec17d69;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/configreader.cpp b/src/configreader.cpp index b3258eb2e..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" @@ -60,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); } @@ -80,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)) { @@ -90,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; } } @@ -106,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); @@ -145,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); @@ -206,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); @@ -353,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()); @@ -369,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; @@ -416,14 +442,14 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v */ for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) { - if (item->GetName() == name) + if (item->GetName() == parent) { ConnectClass c(name, *item); - c.Update(timeout, flood, std::string(*allow ? allow : deny), pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port); + 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(name) + "' which cannot be found."); + throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found."); } else { @@ -560,7 +586,7 @@ 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) @@ -599,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 */ @@ -619,6 +646,7 @@ void ServerConfig::Read(bool bail, userrec* user) {"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}, @@ -649,10 +677,11 @@ void ServerConfig::Read(bool bail, userrec* user) {"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}, @@ -676,7 +705,7 @@ void ServerConfig::Read(bool bail, userrec* user) 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, @@ -907,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()); @@ -919,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()); } } } @@ -928,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()); @@ -940,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()); } } } @@ -1687,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) { @@ -1741,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; +}