X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=fbede2c0ac5eda719923916bfbf7d394b1080ceb;hb=0036e3a70cabea02e9ec2103ed1dfdf5c799289f;hp=5d52ff204c7eb45536c21087cc9ce736960ebf47;hpb=ad9715ffd1025cd6650dfd2208a71e3a0df96073;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 5d52ff204..fbede2c0a 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,10 +11,9 @@ * --------------------------------------------------- */ -/* $Core: libIRCDmodules */ +/* $Core */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socket.h" #include "socketengine.h" @@ -26,9 +25,10 @@ #include #endif + // version is a simple class for holding a modules version number -Version::Version(int major, int minor, int revision, int build, int flags, int api_ver) -: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver) +Version::Version(const std::string &sversion, int flags, int api_ver) +: version(sversion), Flags(flags), API(api_ver) { } @@ -66,7 +66,7 @@ Module* Request::GetDest() return this->dest; } -char* Request::Send() +const char* Request::Send() { if (this->dest) { @@ -104,24 +104,27 @@ std::string Event::GetEventID() // These declarations define the behavours of the base class Module (which does nothing at all) - Module::Module(InspIRCd* Me) : ServerInstance(Me) { } - Module::~Module() { } +Module::Module(InspIRCd* Me) : ServerInstance(Me) { } +Module::~Module() { } + +int Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return 0; } void Module::OnUserConnect(User*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } void Module::OnUserDisconnect(User*) { } -void Module::OnUserJoin(User*, Channel*, bool&) { } +void Module::OnUserJoin(User*, Channel*, bool, bool&) { } void Module::OnPostJoin(User*, Channel*) { } -void Module::OnUserPart(User*, Channel*, const std::string&, bool&) { } -void Module::OnRehash(User*, const std::string&) { } -void Module::OnServerRaw(std::string&, bool, User*) { } -int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; } -void Module::OnMode(User*, void*, int, const std::string&) { } -Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } +void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } +void Module::OnPreRehash(User*, const std::string&) { } +void Module::OnModuleRehash(User*, const std::string&) { } +void Module::OnRehash(User*) { } +int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; } +void Module::OnMode(User*, void*, int, const std::deque&, const std::deque&) { } +Version Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); } void Module::OnOper(User*, const std::string&) { } -void Module::OnPostOper(User*, const std::string&) { } +void Module::OnPostOper(User*, const std::string&, const std::string &) { } void Module::OnInfo(User*) { } void Module::OnWhois(User*, User*) { } -int Module::OnUserPreInvite(User*, User*, Channel*) { return 0; } +int Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return 0; } int Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; } int Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; } int Module::OnUserPreNick(User*, const std::string&) { return 0; } @@ -132,23 +135,26 @@ int Module::OnKill(User*, User*, const std::string&) { return 0; } void Module::OnLoadModule(Module*, const std::string&) { } void Module::OnUnloadModule(Module*, const std::string&) { } void Module::OnBackgroundTimer(time_t) { } -int Module::OnPreCommand(const std::string&, const char**, int, User *, bool, const std::string&) { return 0; } -void Module::OnPostCommand(const std::string&, const char**, int, User *, CmdResult, const std::string&) { } +int Module::OnPreCommand(std::string&, std::vector&, User *, bool, const std::string&) { return 0; } +void Module::OnPostCommand(const std::string&, const std::vector&, User *, CmdResult, const std::string&) { } bool Module::OnCheckReady(User*) { return true; } int Module::OnUserRegister(User*) { return 0; } int Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; } void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { } +int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; } int Module::OnCheckInvite(User*, Channel*) { return 0; } int Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; } int Module::OnCheckLimit(User*, Channel*) { return 0; } int Module::OnCheckBan(User*, Channel*) { return 0; } +int Module::OnCheckExtBan(User *, Channel *, char) { return 0; } +int Module::OnCheckStringExtBan(const std::string &s, Channel *c, char type) { return 0; } int Module::OnStats(char, User*, string_list&) { return 0; } int Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; } int Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; } int Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; } void Module::OnEvent(Event*) { return; } -char* Module::OnRequest(Request*) { return NULL; } -int Module::OnOperCompare(const std::string&, const std::string&, int) { return 0; } +const char* Module::OnRequest(Request*) { return NULL; } +int Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; } void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } int Module::OnAddBan(User*, Channel*, const std::string &) { return 0; } @@ -161,38 +167,41 @@ int Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; } void Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { } -void Module::OnUserInvite(User*, User*, Channel*) { } +void Module::OnUserInvite(User*, User*, Channel*, time_t) { } void Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } void Module::OnGetServerDescription(const std::string&, std::string&) { } void Module::OnSyncUser(User*, Module*, void*) { } void Module::OnSyncChannel(Channel*, Module*, void*) { } -void Module::ProtoSendMode(void*, int, void*, const std::string&) { } +void Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::deque&, const std::deque&) { } void Module::OnSyncChannelMetaData(Channel*, Module*, void*, const std::string&, bool) { } void Module::OnSyncUserMetaData(User*, Module*, void*, const std::string&, bool) { } void Module::OnSyncOtherMetaData(Module*, void*, bool) { } void Module::OnDecodeMetaData(int, void*, const std::string&, const std::string&) { } -void Module::ProtoSendMetaData(void*, int, void*, const std::string&, const std::string&) { } +void Module::ProtoSendMetaData(void*, TargetTypeFlags, void*, const std::string&, const std::string&) { } void Module::OnWallops(User*, const std::string&) { } void Module::OnChangeHost(User*, const std::string&) { } void Module::OnChangeName(User*, const std::string&) { } void Module::OnAddLine(User*, XLine*) { } void Module::OnDelLine(User*, XLine*) { } +void Module::OnExpireLine(XLine*) { } void Module::OnCleanup(int, void*) { } +int Module::OnChannelPreDelete(Channel*) { return 0; } void Module::OnChannelDelete(Channel*) { } -void Module::OnSetAway(User*) { } -void Module::OnCancelAway(User*) { } +int Module::OnSetAway(User*, const std::string &) { return 0; } int Module::OnUserList(User*, Channel*, CUList*&) { return 0; } int Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; } void Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { } void Module::OnGarbageCollect() { } void Module::OnBufferFlushed(User*) { } void Module::OnText(User*, void*, int, const std::string&, char, CUList&) { } - +void Module::OnRunTestSuite() { } +void Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { } +int Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; } +void Module::OnHookUserIO(User*, const std::string&) { } +bool Module::OnHostCycle(User* user) { return false; } ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) { - for (int n = I_BEGIN; n != I_END; ++n) - EventHandlers.push_back(std::vector()); } ModuleManager::~ModuleManager() @@ -231,7 +240,7 @@ void ModuleManager::DetachAll(Module* mod) Detach((Implementation)n, mod); } -bool ModuleManager::SetPriority(Module* mod, PriorityState s) +bool ModuleManager::SetPriority(Module* mod, Priority s) { for (size_t n = I_BEGIN + 1; n != I_END; ++n) SetPriority(mod, (Implementation)n, s); @@ -239,22 +248,15 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s) return true; } -bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz) +bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz) { - if (GetModuleName(mod) != "m_spanningtree.so") - Instance->Log(DEBUG,"ModuleManager::SetPriority called by %s, priority state %s num_modules=%u", GetModuleName(mod).c_str(), s == PRIO_BEFORE ? "PRIO_BEFORE" : - s == PRIO_AFTER ? "PRIO_AFTER" : - s == PRIO_LAST ? "PRIO_LAST" : - s == PRIO_FIRST ? "PRIO_FIRST" : "", - sz); - /** To change the priority of a module, we first find its position in the vector, * then we find the position of the other modules in the vector that this module * wants to be before/after. We pick off either the first or last of these depending * on which they want, and we make sure our module is *at least* before or after * the first or last of this subset, depending again on the type of priority. */ - size_t swap_pos; + size_t swap_pos = 0; size_t source = 0; bool swap = true; bool found = false; @@ -278,39 +280,30 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, if (!found) return false; - Instance->Log(DEBUG,"ModuleManager::SetPriority: My position: %u", source); - - /* Debug stuff. We will probably comment this out some time */ - if (modules) - { - for (size_t n = 0; n < sz; ++n) - { - if (modules[n]) - Instance->Log(DEBUG," Listed Module: [%08x] %s", modules[n], GetModuleName(modules[n]).c_str()); - else - Instance->Log(DEBUG," [null module]"); - } - } - switch (s) { /* Dummy value */ - case PRIO_DONTCARE: + case PRIORITY_DONTCARE: swap = false; break; /* Module wants to be first, sod everything else */ - case PRIO_FIRST: - swap_pos = 0; + case PRIORITY_FIRST: + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else + swap_pos = 0; break; - /* Module is submissive and wants to be last... awww. */ - case PRIO_LAST: - if (EventHandlers[i].empty()) + /* Module wants to be last. */ + case PRIORITY_LAST: + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else if (EventHandlers[i].empty()) swap_pos = 0; else swap_pos = EventHandlers[i].size() - 1; break; /* Place this module after a set of other modules */ - case PRIO_AFTER: + case PRIORITY_AFTER: { /* Find the latest possible position */ swap_pos = 0; @@ -329,7 +322,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, } break; /* Place this module before a set of other modules */ - case PRIO_BEFORE: + case PRIORITY_BEFORE: { swap_pos = EventHandlers[i].size() - 1; swap = false; @@ -351,17 +344,22 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, /* Do we need to swap? */ if (swap && (swap_pos != source)) { - std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]); - Instance->Log(DEBUG,"Swap locations %u and %u", swap_pos, source); - } - else - Instance->Log(DEBUG,"No need to swap"); + // We are going to change positions; we'll need to run again to verify all requirements + if (prioritizationState == PRIO_STATE_LAST) + prioritizationState = PRIO_STATE_AGAIN; + /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ + int incrmnt = 1; - /* Debug stuff. We wont need this some day soon (tm) */ - Instance->Log(DEBUG,"New ordering:"); - for (size_t x = 0; x != EventHandlers[i].size(); ++x) - { - Instance->Log(DEBUG," [%08x] %s", EventHandlers[i][x], GetModuleName(EventHandlers[i][x]).c_str()); + if (source > swap_pos) + incrmnt = -1; + + for (unsigned int j = source; j != swap_pos; j += incrmnt) + { + if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0)) + continue; + + std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]); + } } return true; @@ -381,14 +379,14 @@ bool ModuleManager::Load(const char* filename) if (strchr(filename,'*') || (strchr(filename,'?'))) { int n_match = 0; - DIR* library = opendir(Instance->Config->ModPath); + DIR* library = opendir(Instance->Config->ModPath.c_str()); if (library) { /* Try and locate and load all modules matching the pattern */ dirent* entry = NULL; - while ((entry = readdir(library))) + while (0 != (entry = readdir(library))) { - if (Instance->MatchText(entry->d_name, filename)) + if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map)) { if (!this->Load(entry->d_name)) n_match++; @@ -400,34 +398,27 @@ bool ModuleManager::Load(const char* filename) * to load (but wont abort when it encounters a bad one) and when 1 or * more modules were actually loaded. */ - return (n_match > 0); + return (n_match > 0 ? false : true); } char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename); + snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath.c_str(),filename); std::string filename_str = filename; - if (!ServerConfig::DirValid(modfile)) - { - LastModuleError = "Module " + filename_str + " is not within the modules directory."; - Instance->Log(DEFAULT, LastModuleError); - return false; - } - if (!ServerConfig::FileExists(modfile)) { LastModuleError = "Module file could not be found: " + filename_str; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - + if (Modules.find(filename_str) != Modules.end()) - { + { LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - + Module* newmod = NULL; ircd_module* newhandle = NULL; @@ -439,47 +430,66 @@ bool ModuleManager::Load(const char* filename) newhandle = new ircd_module(Instance, modfile, "init_module"); newmod = newhandle->CallInit(); - if(newmod) + if (newmod) { Version v = newmod->GetVersion(); if (v.API != API_VERSION) { + DetachAll(newmod); delete newmod; + delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } else { - Instance->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + Instance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); } Modules[filename_str] = std::make_pair(newhandle, newmod); } else { + delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } } + /** XXX: Is there anything we can do about this mess? -- Brain */ catch (LoadModuleException& modexcept) { + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason(); - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (FindSymbolException& modexcept) { + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason(); - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (CoreException& modexcept) { + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -490,8 +500,17 @@ bool ModuleManager::Load(const char* filename) * not just the one thats loading, as the new module could affect the preference * of others */ - for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) - n->second.second->Prioritize(); + for(int tries = 0; tries < 20; tries++) + { + prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST; + for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) + n->second.second->Prioritize(); + + if (prioritizationState == PRIO_STATE_LAST) + break; + if (tries == 19) + Instance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); + } Instance->BuildISupport(); return true; @@ -507,14 +526,14 @@ bool ModuleManager::Unload(const char* filename) if (modfind->second.second->GetVersion().Flags & VF_STATIC) { LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } std::pair intercount = GetInterfaceInstanceCount(modfind->second.second); if (intercount.first > 0) { LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -523,7 +542,7 @@ bool ModuleManager::Unload(const char* filename) { modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); } - for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++) + for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) { modfind->second.second->OnCleanup(TYPE_USER,u->second); } @@ -542,14 +561,14 @@ bool ModuleManager::Unload(const char* filename) delete modfind->second.first; Modules.erase(modfind); - Instance->Log(DEFAULT,"Module %s unloaded",filename); + Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); this->ModCount--; Instance->BuildISupport(); return true; } LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!"; - Instance->Log(DEFAULT, LastModuleError); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -559,20 +578,18 @@ void ModuleManager::LoadAll() char configToken[MAXBUF]; ModCount = -1; - for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++) + for(int count = 0; count < Instance->Config->ConfValueEnum("module"); count++) { - Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF); + Instance->Config->ConfValue("module", "name", count, configToken, MAXBUF); printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); - - if (!this->Load(configToken)) + + if (!this->Load(configToken)) { - Instance->Log(DEFAULT, this->LastError()); + Instance->Logs->Log("MODULE", DEFAULT, this->LastError()); printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); Instance->Exit(EXIT_STATUS_MODULE); } } - printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", (this->GetCount()), (this->GetCount()) == 1 ? " has" : "s have"); - Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount()); } bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) @@ -588,7 +605,7 @@ bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) bool ModuleManager::UnpublishFeature(const std::string &FeatureName) { featurelist::iterator iter = Features.find(FeatureName); - + if (iter == Features.end()) return false; @@ -615,14 +632,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M modulelist ml; ml.push_back(Mod); Interfaces[InterfaceName] = std::make_pair(0, ml); - return true; } else { iter->second.second.push_back(Mod); - return true; } - return false; + return true; } bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod) @@ -654,6 +669,19 @@ modulelist* ModuleManager::FindInterface(const std::string &InterfaceName) return &(iter->second.second); } +bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + if (iter == Interfaces.end()) + return false; + else + { + modulelist& ml = iter->second.second; + modulelist::iterator mi = std::find(ml.begin(), ml.end(), mod); + return (mi != ml.end()); + } +} + void ModuleManager::UseInterface(const std::string &InterfaceName) { interfacelist::iterator iter = Interfaces.find(InterfaceName); @@ -715,14 +743,9 @@ Channel* InspIRCd::GetChannelIndex(long index) return NULL; } -bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, User* user) { - return match(sliteral.c_str(),spattern.c_str()); -} - -CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user) -{ - return this->Parser->CallHandler(commandname,parameters,pcnt,user); + return this->Parser->CallHandler(commandname, parameters, user); } bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) @@ -739,12 +762,12 @@ void InspIRCd::AddCommand(Command *f) } } -void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) +void InspIRCd::SendMode(const std::vector& parameters, User *user) { - this->Modes->Process(parameters,pcnt,user,true); + this->Modes->Process(parameters, user, true); } -void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream) +void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream) { std::string CompleteLine = LinePrefix; std::string Word; @@ -760,26 +783,6 @@ void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream User->WriteServ(CompleteLine); } -User* FindDescriptorHandler::Call(int socket) -{ - return reinterpret_cast(Server->SE->GetRef(socket)); -} - -bool InspIRCd::AddMode(ModeHandler* mh) -{ - return this->Modes->AddMode(mh); -} - -bool InspIRCd::AddModeWatcher(ModeWatcher* mw) -{ - return this->Modes->AddModeWatcher(mw); -} - -bool InspIRCd::DelModeWatcher(ModeWatcher* mw) -{ - return this->Modes->DelModeWatcher(mw); -} - bool InspIRCd::AddResolver(Resolver* r, bool cached) { if (!cached) @@ -813,46 +816,21 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) { - /* Is there any reason to load the entire config file again here? - * it's needed if they specify another config file, but using the - * default one we can just use the global config data - pre-parsed! - */ - this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out); - this->error = CONF_NO_ERROR; - this->data = &ServerInstance->Config->config_data; - this->privatehash = false; + this->error = 0; } ConfigReader::~ConfigReader() { - if (this->errorlog) - delete this->errorlog; - if(this->privatehash) - delete this->data; -} - - -ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) -{ - ServerInstance->Config->ClearStack(); - - this->error = CONF_NO_ERROR; - this->data = new ConfigDataHash; - this->privatehash = true; - this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out); - this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog); - if (!this->readerror) - this->error = CONF_FILE_NOT_FOUND; } std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds) { - /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ + /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ std::string result; - - if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) + + if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds)) { this->error = CONF_VALUE_NOT_FOUND; } @@ -866,7 +844,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index) { - return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index); + return ServerInstance->Config->ConfValueBool(tag, name, default_value, index); } bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) @@ -878,19 +856,19 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive) { int result; - - if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result)) + + if(!ServerInstance->Config->ConfValueInteger(tag, name, default_value, index, result)) { this->error = CONF_VALUE_NOT_FOUND; return 0; } - + if ((need_positive) && (result < 0)) { this->error = CONF_INT_NEGATIVE; return 0; } - + return result; } @@ -906,28 +884,16 @@ long ConfigReader::GetError() return olderr; } -void ConfigReader::DumpErrors(bool bail, User* user) -{ - ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user); -} - - int ConfigReader::Enumerate(const std::string &tag) { - return ServerInstance->Config->ConfValueEnum(*this->data, tag); + return ServerInstance->Config->ConfValueEnum(tag); } int ConfigReader::EnumerateValues(const std::string &tag, int index) { - return ServerInstance->Config->ConfVarEnum(*this->data, tag, index); + return ServerInstance->Config->ConfVarEnum(tag, index); } -bool ConfigReader::Verify() -{ - return this->readerror; -} - - FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) { LoadFile(filename);