X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=8061248d24b89d60b961e97fb25051b588fe4761;hb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;hp=67a37c573f579111f39d4a8f622a9317023b4655;hpb=8923de4c4ff8e48f15baf8ca5914f664012cbd8d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 67a37c573..8061248d2 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,7 +11,7 @@ * --------------------------------------------------- */ -/* $Core: libIRCDmodules */ +/* $Core */ #include "inspircd.h" #include "wildcard.h" @@ -66,7 +66,7 @@ Module* Request::GetDest() return this->dest; } -char* Request::Send() +const char* Request::Send() { if (this->dest) { @@ -109,19 +109,19 @@ std::string Event::GetEventID() 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::OnUserPart(User*, Channel*, 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; } +int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const 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::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 +132,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,7 +164,7 @@ 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*) { } @@ -177,22 +180,24 @@ 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&) { } ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) { - for (int n = I_BEGIN + 1; n != I_END; ++n) - EventHandlers.push_back(std::vector()); } ModuleManager::~ModuleManager() @@ -241,18 +246,20 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s) bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState 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); - - size_t swap_pos; + /** 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 = 0; size_t source = 0; bool swap = true; bool found = false; + /* Locate our module. This is O(n) but it only occurs on module load so we're + * not too bothered about it + */ for (size_t x = 0; x != EventHandlers[i].size(); ++x) { if (EventHandlers[i][x] == mod) @@ -263,36 +270,30 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, } } + /* Eh? this module doesnt exist, probably trying to set priority on an event + * theyre not attached to. + */ if (!found) return false; - Instance->Log(DEBUG,"ModuleManager::SetPriority: My position: %u", source); - - 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: swap = false; break; + /* Module wants to be first, sod everything else */ case PRIO_FIRST: swap_pos = 0; break; + /* Module is submissive and wants to be last... awww. */ case PRIO_LAST: 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: { /* Find the latest possible position */ @@ -311,6 +312,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, } } break; + /* Place this module before a set of other modules */ case PRIO_BEFORE: { swap_pos = EventHandlers[i].size() - 1; @@ -330,26 +332,30 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, break; } + /* 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"); + /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ + int incrmnt = 1; - 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; } -const char* ModuleManager::LastError() +std::string& ModuleManager::LastError() { - return MODERR; + return LastModuleError; } bool ModuleManager::Load(const char* filename) @@ -366,7 +372,7 @@ bool ModuleManager::Load(const char* filename) { /* 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)) { @@ -389,210 +395,166 @@ bool ModuleManager::Load(const char* filename) if (!ServerConfig::DirValid(modfile)) { - snprintf(MODERR, MAXBUF,"Module %s is not within the modules directory.", modfile); - Instance->Log(DEFAULT, MODERR); + LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)"; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } if (!ServerConfig::FileExists(modfile)) { - snprintf(MODERR,MAXBUF,"Module file could not be found: %s", modfile); - Instance->Log(DEFAULT, MODERR); + LastModuleError = "Module file could not be found: " + filename_str; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - if(find(Instance->Config->module_names.begin(), Instance->Config->module_names.end(), filename_str) != Instance->Config->module_names.end()) + if (Modules.find(filename_str) != Modules.end()) { - Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); - snprintf(MODERR, MAXBUF, "Module already loaded"); + LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - Module* newmod; - ircd_module* newhandle; - - newmod = NULL; - newhandle = NULL; - + Module* newmod = NULL; + ircd_module* newhandle = NULL; + try { /* This will throw a CoreException if there's a problem loading * the module file or getting a pointer to the init_module symbol. */ newhandle = new ircd_module(Instance, modfile, "init_module"); - - handles[this->ModCount+1] = newhandle; - - newmod = handles[this->ModCount+1]->CallInit(); + newmod = newhandle->CallInit(); - if(newmod) + if (newmod) { Version v = newmod->GetVersion(); if (v.API != API_VERSION) { + DetachAll(newmod); delete newmod; - Instance->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION); - snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION); + delete newhandle; + LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")"; + 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 %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); } - modules[this->ModCount+1] = newmod; - - /* save the module and the module's classfactory, if - * this isnt done, random crashes can occur :/ */ - Instance->Config->module_names.push_back(filename); + Modules[filename_str] = std::make_pair(newhandle, newmod); } else { - Instance->Log(DEFAULT, "Unable to load %s",modfile); - snprintf(MODERR,MAXBUF, "Probably missing init_module() entrypoint, but dlsym() didn't notice a problem"); + delete newhandle; + LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem"; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } } + /** XXX: Is there anything we can do about this mess? -- Brain */ catch (LoadModuleException& modexcept) { - Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason()); + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; + LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason(); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (FindSymbolException& modexcept) { - Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason()); + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; + LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason(); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (CoreException& modexcept) { - Instance->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); + DetachAll(newmod); + if (newmod) + delete newmod; + if (newhandle) + delete newhandle; + LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - + this->ModCount++; - FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str)); + FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str)); - for (int n = 0; n != this->ModCount+1; ++n) - modules[n]->Prioritize(); + /* We give every module a chance to re-prioritize when we introduce a new one, + * 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(); Instance->BuildISupport(); return true; } -bool ModuleManager::EraseHandle(unsigned int j) -{ - ModuleHandleList::iterator iter; - - if (j >= handles.size()) - { - return false; - } - - iter = handles.begin() + j; - - if(*iter) - { - delete *iter; - handles.erase(iter); - handles.push_back(NULL); - } - - return true; -} - -bool ModuleManager::EraseModule(unsigned int j) +bool ModuleManager::Unload(const char* filename) { - bool success = false; - - ModuleList::iterator iter; - - if (j >= modules.size()) - { - return false; - } + std::string filename_str(filename); + std::map >::iterator modfind = Modules.find(filename); - iter = modules.begin() + j; - - if (*iter) - { - delete *iter; - modules.erase(iter); - modules.push_back(NULL); - success = true; - } - - std::vector::iterator iter2; - - if (j >= Instance->Config->module_names.size()) + if (modfind != Modules.end()) { - return false; - } + if (modfind->second.second->GetVersion().Flags & VF_STATIC) + { + LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; + 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->Logs->Log("MODULE", DEFAULT, LastModuleError); + return false; + } - iter2 = Instance->Config->module_names.begin() + j; + /* Give the module a chance to tidy out all its metadata */ + for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++) + { + modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); + } + for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) + { + modfind->second.second->OnCleanup(TYPE_USER,u->second); + } - Instance->Config->module_names.erase(iter2); - success = true; + /* Tidy up any dangling resolvers */ + Instance->Res->CleanResolvers(modfind->second.second); - return success; -} -bool ModuleManager::Unload(const char* filename) -{ - std::string filename_str = filename; - for (unsigned int j = 0; j != Instance->Config->module_names.size(); j++) - { - if (Instance->Config->module_names[j] == filename_str) - { - if (modules[j]->GetVersion().Flags & VF_STATIC) - { - Instance->Log(DEFAULT,"Failed to unload STATIC module %s",filename); - snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); - return false; - } - std::pair intercount = GetInterfaceInstanceCount(modules[j]); - if (intercount.first > 0) - { - Instance->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str()); - snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!", - intercount.first, - intercount.first > 1 ? "s" : "", - intercount.first > 1 ? "are" : "is", - intercount.second.c_str()); - return false; - } - /* Give the module a chance to tidy out all its metadata */ - for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++) - { - modules[j]->OnCleanup(TYPE_CHANNEL,c->second); - } - for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++) - { - modules[j]->OnCleanup(TYPE_USER,u->second); - } + FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); - /* Tidy up any dangling resolvers */ - Instance->Res->CleanResolvers(modules[j]); + this->DetachAll(modfind->second.second); - FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j])); + Instance->Parser->RemoveCommands(filename); - this->DetachAll(modules[j]); + delete modfind->second.second; + delete modfind->second.first; + Modules.erase(modfind); - // found the module - Instance->Parser->RemoveCommands(filename); - this->EraseModule(j); - this->EraseHandle(j); - Instance->Log(DEFAULT,"Module %s unloaded",filename); - this->ModCount--; - Instance->BuildISupport(); - return true; - } + Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); + this->ModCount--; + Instance->BuildISupport(); + return true; } - Instance->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); - snprintf(MODERR,MAXBUF,"Module not loaded"); + + LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!"; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -600,7 +562,6 @@ bool ModuleManager::Unload(const char* filename) void ModuleManager::LoadAll() { char configToken[MAXBUF]; - Instance->Config->module_names.clear(); ModCount = -1; for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++) @@ -610,13 +571,11 @@ void ModuleManager::LoadAll() if (!this->Load(configToken)) { - Instance->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->LastError()); - printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, 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()+1), (this->GetCount()+1) == 1 ? " has" : "s have"); - Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount()+1); } bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) @@ -659,14 +618,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) @@ -698,6 +655,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); @@ -730,19 +700,15 @@ std::pair ModuleManager::GetInterfaceInstanceCount(Module* m) const std::string& ModuleManager::GetModuleName(Module* m) { - static std::string nothing; /* Prevent compiler warning */ - - if (!this->GetCount()) - return nothing; + static std::string nothing; - for (int i = 0; i <= this->GetCount(); i++) + for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) { - if (this->modules[i] == m) - { - return Instance->Config->module_names[i]; - } + if (n->second.second == m) + return n->first; } - return nothing; /* As above */ + + return nothing; } /* This is ugly, yes, but hash_map's arent designed to be @@ -765,12 +731,12 @@ Channel* InspIRCd::GetChannelIndex(long index) bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern) { - return match(sliteral.c_str(),spattern.c_str()); + return match(sliteral, spattern); } -CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, 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) @@ -787,12 +753,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; @@ -813,21 +779,6 @@ 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) @@ -842,22 +793,25 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached) Module* ModuleManager::Find(const std::string &name) { - for (int i = 0; i <= this->GetCount(); i++) - { - if (Instance->Config->module_names[i] == name) - { - return this->modules[i]; - } - } - return NULL; + std::map >::iterator modfind = Modules.find(name); + + if (modfind == Modules.end()) + return NULL; + else + return modfind->second.second; +} + +const std::vector ModuleManager::GetAllModuleNames(int filter) +{ + std::vector retval; + for (std::map >::iterator x = Modules.begin(); x != Modules.end(); ++x) + if (!filter || (x->second.second->GetVersion().Flags & filter)) + retval.push_back(x->first); + return retval; } 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; @@ -882,7 +836,8 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se 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); + /*** XXX: This might block! */ + this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog); if (!this->readerror) this->error = CONF_FILE_NOT_FOUND; }