X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=b2d2f23c68af1acf45b429bd3de819298f0393de;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=0c99218a1aa5f8e1e006145dc87d30809eca8856;hpb=4840d5e77572f42b710501912d59b5dbb6d2c2af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 0c99218a1..b2d2f23c6 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -1,20 +1,30 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2003-2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2006-2007 Oliver Lupton + * Copyright (C) 2007 Pippijn van Steenhoven + * Copyright (C) 2003 randomdan * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core: libIRCDmodules */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socket.h" #include "socketengine.h" @@ -22,185 +32,153 @@ #include "dns.h" #include "exitcodes.h" -#ifndef WIN32 +#ifndef _WIN32 #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) -{ -} +static std::vector* dynrefs = NULL; -Request::Request(char* anydata, Module* src, Module* dst) -: data(anydata), source(src), dest(dst) +void dynamic_reference_base::reset_all() { - /* Ensure that because this module doesnt support ID strings, it doesnt break modules that do - * by passing them uninitialized pointers (could happen) - */ - id = '\0'; + if (!dynrefs) + return; + for(unsigned int i = 0; i < dynrefs->size(); i++) + (*dynrefs)[i]->ClearCache(); } -Request::Request(Module* src, Module* dst, const char* idstr) -: id(idstr), source(src), dest(dst) +// Version is a simple class for holding a modules version number +Version::Version(const std::string &desc, int flags) : description(desc), Flags(flags) { } -char* Request::GetData() +Version::Version(const std::string &desc, int flags, const std::string& linkdata) +: description(desc), Flags(flags), link_data(linkdata) { - return this->data; } -const char* Request::GetId() +Request::Request(Module* src, Module* dst, const char* idstr) +: id(idstr), source(src), dest(dst) { - return this->id; } -Module* Request::GetSource() +void Request::Send() { - return this->source; + if (dest) + dest->OnRequest(*this); } -Module* Request::GetDest() -{ - return this->dest; -} +Event::Event(Module* src, const std::string &eventid) : source(src), id(eventid) { } -char* Request::Send() +void Event::Send() { - if (this->dest) - { - return dest->OnRequest(this); - } - else - { - return NULL; - } + FOREACH_MOD(I_OnEvent,OnEvent(*this)); } -Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { } - -char* Event::GetData() -{ - return (char*)this->data; -} +// These declarations define the behavours of the base class Module (which does nothing at all) -Module* Event::GetSource() +Module::Module() { } +CullResult Module::cull() { - return this->source; + return classbase::cull(); } - -char* Event::Send(InspIRCd* ServerInstance) +Module::~Module() { - FOREACH_MOD(I_OnEvent,OnEvent(this)); - return NULL; } -std::string Event::GetEventID() -{ - return this->id; -} - - -// These declarations define the behavours of the base class Module (which does nothing at all) - - Module::Module(InspIRCd* Me) : ServerInstance(Me) { } - Module::~Module() { } -void Module::OnUserConnect(User*) { } +ModResult Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; } +void Module::OnUserConnect(LocalUser*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } -void Module::OnUserDisconnect(User*) { } -void Module::OnUserJoin(User*, Channel*, 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::OnUserDisconnect(LocalUser*) { } +void Module::OnUserJoin(Membership*, bool, bool, CUList&) { } +void Module::OnPostJoin(Membership*) { } +void Module::OnUserPart(Membership*, std::string&, CUList&) { } +void Module::OnPreRehash(User*, const std::string&) { } +void Module::OnModuleRehash(User*, const std::string&) { } +void Module::OnRehash(User*) { } +ModResult Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnMode(User*, void*, int, const std::vector&, const std::vector&) { } 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::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; } +ModResult Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreNick(User*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnUserPostNick(User*, const std::string&) { } -int Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; } +ModResult Module::OnPreMode(User*, User*, Channel*, const std::vector&) { return MOD_RES_PASSTHRU; } void Module::On005Numeric(std::string&) { } -int Module::OnKill(User*, User*, const std::string&) { return 0; } -void Module::OnLoadModule(Module*, const std::string&) { } -void Module::OnUnloadModule(Module*, const std::string&) { } +ModResult Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnLoadModule(Module*) { } +void Module::OnUnloadModule(Module*) { } 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&) { } -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::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::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; } +ModResult Module::OnPreCommand(std::string&, std::vector&, LocalUser*, bool, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnPostCommand(const std::string&, const std::vector&, LocalUser*, CmdResult, const std::string&) { } +void Module::OnUserInit(LocalUser*) { } +ModResult Module::OnCheckReady(LocalUser*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserRegister(LocalUser*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { } +ModResult Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckInvite(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckKey(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckLimit(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckChannelBan(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckBan(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnExtBanCheck(User*, Channel*, char) { return MOD_RES_PASSTHRU; } +ModResult Module::OnStats(char, User*, string_list&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnChangeLocalUserHost(LocalUser*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnChangeLocalUserGECOS(LocalUser*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnPreTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnEvent(Event&) { } +void Module::OnRequest(Request&) { } +ModResult Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; } void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } -int Module::OnAddBan(User*, Channel*, const std::string &) { return 0; } -int Module::OnDelBan(User*, Channel*, const std::string &) { return 0; } -void Module::OnRawSocketAccept(int, const std::string&, int) { } -int Module::OnRawSocketWrite(int, const char*, int) { return 0; } -void Module::OnRawSocketClose(int) { } -void Module::OnRawSocketConnect(int) { } -int Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; } +ModResult Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } +ModResult Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } +void Module::OnStreamSocketAccept(StreamSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { } +int Module::OnStreamSocketWrite(StreamSocket*, std::string&) { return -1; } +void Module::OnStreamSocketClose(StreamSocket*) { } +void Module::OnStreamSocketConnect(StreamSocket*) { } +int Module::OnStreamSocketRead(StreamSocket*, std::string&) { return -1; } 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::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } +void Module::OnUserInvite(User*, User*, Channel*, time_t) { } +void Module::OnPostTopicChange(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::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::OnSyncNetwork(Module*, void*) { } +void Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector&, const std::vector&) { } +void Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { } +void Module::ProtoSendMetaData(void*, Extensible*, 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::OnAddGLine(long, User*, const std::string&, const std::string&) { } -void Module::OnAddZLine(long, User*, const std::string&, const std::string&) { } -void Module::OnAddKLine(long, User*, const std::string&, const std::string&) { } -void Module::OnAddQLine(long, User*, const std::string&, const std::string&) { } -void Module::OnAddELine(long, User*, const std::string&, const std::string&) { } -void Module::OnDelGLine(User*, const std::string&) { } -void Module::OnDelZLine(User*, const std::string&) { } -void Module::OnDelKLine(User*, const std::string&) { } -void Module::OnDelQLine(User*, const std::string&) { } -void Module::OnDelELine(User*, const std::string&) { } +void Module::OnChangeIdent(User*, const std::string&) { } +void Module::OnAddLine(User*, XLine*) { } +void Module::OnDelLine(User*, XLine*) { } +void Module::OnExpireLine(XLine*) { } void Module::OnCleanup(int, void*) { } -void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; } +ModResult Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; } void Module::OnChannelDelete(Channel*) { } -Priority Module::Prioritize() { return PRIORITY_DONTCARE; } -void Module::OnSetAway(User*) { } -void Module::OnCancelAway(User*) { } -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&) { } +ModResult Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; } +ModResult Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnBuildNeighborList(User*, UserChanList&, std::map&) { } void Module::OnGarbageCollect() { } -void Module::OnBufferFlushed(User*) { } +ModResult Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { return MOD_RES_PASSTHRU; } void Module::OnText(User*, void*, int, const std::string&, char, CUList&) { } +void Module::OnRunTestSuite() { } +void Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { } +ModResult Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnHookIO(StreamSocket*, ListenSocket*) { } +ModResult Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { return MOD_RES_PASSTHRU; } +void Module::OnSendWhoLine(User*, const std::vector&, User*, std::string&) { } +void Module::OnSetUserIP(LocalUser*) { } - -ModuleManager::ModuleManager(InspIRCd* Ins) -: ModCount(0), Instance(Ins) +ModuleManager::ModuleManager() : ModCount(0) { } @@ -208,630 +186,400 @@ ModuleManager::~ModuleManager() { } -const char* ModuleManager::LastError() +bool ModuleManager::Attach(Implementation i, Module* mod) { - return MODERR; -} - -bool ModuleManager::Load(const char* filename) -{ - /* Do we have a glob pattern in the filename? - * The user wants to load multiple modules which - * match the pattern. - */ - if (strchr(filename,'*') || (strchr(filename,'?'))) - { - int n_match = 0; - DIR* library = opendir(Instance->Config->ModPath); - if (library) - { - /* Try and locate and load all modules matching the pattern */ - dirent* entry = NULL; - while ((entry = readdir(library))) - { - if (Instance->MatchText(entry->d_name, filename)) - { - if (!this->Load(entry->d_name)) - n_match++; - } - } - closedir(library); - } - /* Loadmodule will now return false if any one of the modules failed - * to load (but wont abort when it encounters a bad one) and when 1 or - * more modules were actually loaded. - */ - return (n_match > 0); - } - - char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename); - std::string filename_str = filename; - - if (!ServerConfig::DirValid(modfile)) - { - snprintf(MODERR, MAXBUF,"Module %s is not within the modules directory.", modfile); - Instance->Log(DEFAULT, MODERR); - return false; - } - - if (!ServerConfig::FileExists(modfile)) - { - snprintf(MODERR,MAXBUF,"Module file could not be found: %s", modfile); - Instance->Log(DEFAULT, MODERR); - return false; - } - - if(find(Instance->Config->module_names.begin(), Instance->Config->module_names.end(), filename_str) != Instance->Config->module_names.end()) - { - Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); - snprintf(MODERR, MAXBUF, "Module already loaded"); + if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end()) return false; - } - - Module* newmod; - ircd_module* newhandle; - - newmod = NULL; - 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(); - - if(newmod) - { - Version v = newmod->GetVersion(); - - if (v.API != API_VERSION) - { - 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); - 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]")); - } - - 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); - - char* x = &Instance->Config->implement_lists[this->ModCount+1][0]; - for(int t = 0; t < 255; t++) - x[t] = 0; - modules[this->ModCount+1]->Implements(x); - - for(int t = 0; t < 255; t++) - Instance->Config->global_implementation[t] += Instance->Config->implement_lists[this->ModCount+1][t]; - } - else - { - Instance->Log(DEFAULT, "Unable to load %s",modfile); - snprintf(MODERR,MAXBUF, "Probably missing init_module() entrypoint, but dlsym() didn't notice a problem"); - return false; - } - } - catch (LoadModuleException& modexcept) - { - Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason()); - snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason()); - 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()); - 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()); - return false; - } - - this->ModCount++; - FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str)); - // now work out which modules, if any, want to move to the back of the queue, - // and if they do, move them there. - std::vector put_to_back; - std::vector put_to_front; - std::map put_before; - std::map put_after; - for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++) - { - if (modules[j]->Prioritize() == PRIORITY_LAST) - put_to_back.push_back(Instance->Config->module_names[j]); - else if (modules[j]->Prioritize() == PRIORITY_FIRST) - put_to_front.push_back(Instance->Config->module_names[j]); - else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE) - put_before[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8]; - else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER) - put_after[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8]; - } - for (unsigned int j = 0; j < put_to_back.size(); j++) - MoveToLast(put_to_back[j]); - for (unsigned int j = 0; j < put_to_front.size(); j++) - MoveToFirst(put_to_front[j]); - for (std::map::iterator j = put_before.begin(); j != put_before.end(); j++) - MoveBefore(j->first,j->second); - for (std::map::iterator j = put_after.begin(); j != put_after.end(); j++) - MoveAfter(j->first,j->second); - Instance->BuildISupport(); + EventHandlers[i].push_back(mod); return true; } -bool ModuleManager::EraseHandle(unsigned int j) +bool ModuleManager::Detach(Implementation i, Module* mod) { - ModuleHandleList::iterator iter; - - if (j >= handles.size()) - { - return false; - } - - iter = handles.begin() + j; + EventHandlerIter x = std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod); - if(*iter) - { - delete *iter; - handles.erase(iter); - handles.push_back(NULL); - } + if (x == EventHandlers[i].end()) + return false; + EventHandlers[i].erase(x); return true; } -bool ModuleManager::EraseModule(unsigned int j) +void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz) { - bool success = false; - - ModuleList::iterator iter; - - if (j >= modules.size()) - { - return false; - } - - 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()) - { - return false; - } - - iter2 = Instance->Config->module_names.begin() + j; - - Instance->Config->module_names.erase(iter2); - success = true; - - return success; + for (size_t n = 0; n < sz; ++n) + Attach(i[n], mod); } -void ModuleManager::MoveTo(std::string modulename,int slot) +void ModuleManager::DetachAll(Module* mod) { - unsigned int v2 = 256; - - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) - { - if (Instance->Config->module_names[v] == modulename) - { - // found an instance, swap it with the item at the end - v2 = v; - break; - } - } - if ((v2 != (unsigned int)slot) && (v2 < 256)) - { - // Swap the module names over - Instance->Config->module_names[v2] = Instance->Config->module_names[slot]; - Instance->Config->module_names[slot] = modulename; - // now swap the module factories - ircd_module* temp = handles[v2]; - handles[v2] = handles[slot]; - handles[slot] = temp; - // now swap the module objects - Module* temp_module = modules[v2]; - modules[v2] = modules[slot]; - modules[slot] = temp_module; - // now swap the implement lists (we dont - // need to swap the global or recount it) - for (int n = 0; n < 255; n++) - { - char x = Instance->Config->implement_lists[v2][n]; - Instance->Config->implement_lists[v2][n] = Instance->Config->implement_lists[slot][n]; - Instance->Config->implement_lists[slot][n] = x; - } - } + for (size_t n = I_BEGIN + 1; n != I_END; ++n) + Detach((Implementation)n, mod); } -void ModuleManager::MoveAfter(std::string modulename, std::string after) +bool ModuleManager::SetPriority(Module* mod, Priority s) { - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) - { - if (Instance->Config->module_names[v] == after) - { - MoveTo(modulename, v); - return; - } - } + for (size_t n = I_BEGIN + 1; n != I_END; ++n) + SetPriority(mod, (Implementation)n, s); + + return true; } -void ModuleManager::MoveBefore(std::string modulename, std::string before) +bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module* which) { - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) + /** 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 my_pos = 0; + + /* 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 (Instance->Config->module_names[v] == before) + if (EventHandlers[i][x] == mod) { - if (v > 0) - { - MoveTo(modulename, v-1); - } - else - { - MoveTo(modulename, v); - } - return; + my_pos = x; + goto found_src; } } -} -void ModuleManager::MoveToFirst(std::string modulename) -{ - MoveTo(modulename,0); -} - -void ModuleManager::MoveToLast(std::string modulename) -{ - MoveTo(modulename,this->GetCount()); -} + /* Eh? this module doesnt exist, probably trying to set priority on an event + * theyre not attached to. + */ + return false; -bool ModuleManager::Unload(const char* filename) -{ - std::string filename_str = filename; - for (unsigned int j = 0; j != Instance->Config->module_names.size(); j++) +found_src: + size_t swap_pos = my_pos; + switch (s) { - if (Instance->Config->module_names[j] == filename_str) + case PRIORITY_FIRST: + if (prioritizationState != PRIO_STATE_FIRST) + return true; + else + swap_pos = 0; + break; + case PRIORITY_LAST: + if (prioritizationState != PRIO_STATE_FIRST) + return true; + else + swap_pos = EventHandlers[i].size() - 1; + break; + case PRIORITY_AFTER: { - 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); - } - - /* Tidy up any dangling resolvers */ - Instance->Res->CleanResolvers(modules[j]); - - FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j])); - - for(int t = 0; t < 255; t++) + /* Find the latest possible position, only searching AFTER our position */ + for (size_t x = EventHandlers[i].size() - 1; x > my_pos; --x) { - Instance->Config->global_implementation[t] -= Instance->Config->implement_lists[j][t]; + if (EventHandlers[i][x] == which) + { + swap_pos = x; + goto swap_now; + } } - - /* We have to renumber implement_lists after unload because the module numbers change! - */ - for(int j2 = j; j2 < 254; j2++) + // didn't find it - either not loaded or we're already after + return true; + } + /* Place this module before a set of other modules */ + case PRIORITY_BEFORE: + { + for (size_t x = 0; x < my_pos; ++x) { - for(int t = 0; t < 255; t++) + if (EventHandlers[i][x] == which) { - Instance->Config->implement_lists[j2][t] = Instance->Config->implement_lists[j2+1][t]; + swap_pos = x; + goto swap_now; } } - - // found the module - Instance->Parser->RemoveCommands(filename); - this->EraseModule(j); - this->EraseHandle(j); - Instance->Log(DEFAULT,"Module %s unloaded",filename); - this->ModCount--; - Instance->BuildISupport(); + // didn't find it - either not loaded or we're already before return true; } } - Instance->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename); - snprintf(MODERR,MAXBUF,"Module not loaded"); - return false; -} -/* We must load the modules AFTER initializing the socket engine, now */ -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++) +swap_now: + /* Do we need to swap? */ + if (swap_pos != my_pos) { - Instance->Config->ConfValue(Instance->Config->config_data, "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)) - { - 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->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); -} + // 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; -long ModuleManager::PriorityAfter(const std::string &modulename) -{ - for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++) - { - if (Instance->Config->module_names[j] == modulename) - { - return ((j << 8) | PRIORITY_AFTER); - } - } - return PRIORITY_DONTCARE; -} + if (my_pos > swap_pos) + incrmnt = -1; -long ModuleManager::PriorityBefore(const std::string &modulename) -{ - for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++) - { - if (Instance->Config->module_names[j] == modulename) + for (unsigned int j = my_pos; j != swap_pos; j += incrmnt) { - return ((j << 8) | PRIORITY_BEFORE); + if ((j + incrmnt > EventHandlers[i].size() - 1) || ((incrmnt == -1) && (j == 0))) + continue; + + std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]); } } - return PRIORITY_DONTCARE; + + return true; } -bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) +bool ModuleManager::CanUnload(Module* mod) { - if (Features.find(FeatureName) == Features.end()) + std::map::iterator modfind = Modules.find(mod->ModuleSourceFile); + + if ((modfind == Modules.end()) || (modfind->second != mod) || (mod->dying)) { - Features[FeatureName] = Mod; - return true; + LastModuleError = "Module " + mod->ModuleSourceFile + " is not loaded, cannot unload it!"; + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); + return false; } - return false; -} - -bool ModuleManager::UnpublishFeature(const std::string &FeatureName) -{ - featurelist::iterator iter = Features.find(FeatureName); - - if (iter == Features.end()) + if (mod->GetVersion().Flags & VF_STATIC) + { + LastModuleError = "Module " + mod->ModuleSourceFile + " not unloadable (marked static)"; + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; + } - Features.erase(iter); + mod->dying = true; return true; } -Module* ModuleManager::FindFeature(const std::string &FeatureName) +void ModuleManager::DoSafeUnload(Module* mod) { - featurelist::iterator iter = Features.find(FeatureName); - - if (iter == Features.end()) - return NULL; + std::map::iterator modfind = Modules.find(mod->ModuleSourceFile); - return iter->second; -} - -bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod) -{ - interfacelist::iterator iter = Interfaces.find(InterfaceName); - - if (iter == Interfaces.end()) + std::vector > items; + ServerInstance->Extensions.BeginUnregister(modfind->second, items); + /* Give the module a chance to tidy out all its metadata */ + for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); ) { - modulelist ml; - ml.push_back(Mod); - Interfaces[InterfaceName] = std::make_pair(0, ml); - return true; + Channel* chan = c->second; + ++c; + mod->OnCleanup(TYPE_CHANNEL, chan); + chan->doUnhookExtensions(items); + const UserMembList* users = chan->GetUsers(); + for(UserMembCIter mi = users->begin(); mi != users->end(); mi++) + mi->second->doUnhookExtensions(items); } - else + for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); ) { - iter->second.second.push_back(Mod); - return true; + User* user = u->second; + // The module may quit the user (e.g. SSL mod unloading) and that will remove it from the container + ++u; + mod->OnCleanup(TYPE_USER, user); + user->doUnhookExtensions(items); + } + for(char m='A'; m <= 'z'; m++) + { + ModeHandler* mh; + mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER); + if (mh && mh->creator == mod) + ServerInstance->Modes->DelMode(mh); + mh = ServerInstance->Modes->FindMode(m, MODETYPE_CHANNEL); + if (mh && mh->creator == mod) + ServerInstance->Modes->DelMode(mh); + } + for(std::multimap::iterator i = DataProviders.begin(); i != DataProviders.end(); ) + { + std::multimap::iterator curr = i++; + if (curr->second->creator == mod) + DataProviders.erase(curr); } - return false; -} -bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod) -{ - interfacelist::iterator iter = Interfaces.find(InterfaceName); + dynamic_reference_base::reset_all(); - if (iter == Interfaces.end()) - return false; + /* Tidy up any dangling resolvers */ + ServerInstance->Res->CleanResolvers(mod); + + FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(mod)); + + DetachAll(mod); + + Modules.erase(modfind); + ServerInstance->GlobalCulls.AddItem(mod); - for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",mod->ModuleSourceFile.c_str()); + this->ModCount--; + ServerInstance->BuildISupport(); +} + +void ModuleManager::UnloadAll() +{ + /* We do this more than once, so that any service providers get a + * chance to be unhooked by the modules using them, but then get + * a chance to be removed themsleves. + * + * Note: this deliberately does NOT delete the DLLManager objects + */ + for (int tries = 0; tries < 4; tries++) { - if (*x == Mod) + std::map::iterator i = Modules.begin(); + while (i != Modules.end()) { - iter->second.second.erase(x); - if (iter->second.second.empty()) - Interfaces.erase(InterfaceName); - return true; + std::map::iterator me = i++; + if (CanUnload(me->second)) + { + DoSafeUnload(me->second); + } } + ServerInstance->GlobalCulls.Apply(); } - return false; } -modulelist* ModuleManager::FindInterface(const std::string &InterfaceName) +std::string& ModuleManager::LastError() { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter == Interfaces.end()) - return NULL; - else - return &(iter->second.second); + return LastModuleError; } -void ModuleManager::UseInterface(const std::string &InterfaceName) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, User* user) { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter != Interfaces.end()) - iter->second.first++; - + return this->Parser->CallHandler(commandname, parameters, user); } -void ModuleManager::DoneWithInterface(const std::string &InterfaceName) +bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter != Interfaces.end()) - iter->second.first--; + return this->Parser->IsValidCommand(commandname, pcnt, user); } -std::pair ModuleManager::GetInterfaceInstanceCount(Module* m) +void ModuleManager::AddService(ServiceProvider& item) { - for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++) + switch (item.service) { - for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + case SERVICE_COMMAND: + if (!ServerInstance->Parser->AddCommand(static_cast(&item))) + throw ModuleException("Command "+std::string(item.name)+" already exists."); + return; + case SERVICE_MODE: + if (!ServerInstance->Modes->AddMode(static_cast(&item))) + throw ModuleException("Mode "+std::string(item.name)+" already exists."); + return; + case SERVICE_METADATA: + if (!ServerInstance->Extensions.Register(static_cast(&item))) + throw ModuleException("Extension " + std::string(item.name) + " already exists."); + return; + case SERVICE_DATA: + case SERVICE_IOHOOK: { - if (*x == m) + DataProviders.insert(std::make_pair(item.name, &item)); + std::string::size_type slash = item.name.find('/'); + if (slash != std::string::npos) { - return std::make_pair(iter->second.first, iter->first); + DataProviders.insert(std::make_pair(item.name.substr(0, slash), &item)); + DataProviders.insert(std::make_pair(item.name.substr(slash + 1), &item)); } + return; } + default: + throw ModuleException("Cannot add unknown service type"); } - return std::make_pair(0, ""); } -const std::string& ModuleManager::GetModuleName(Module* m) +void ModuleManager::DelService(ServiceProvider& item) { - static std::string nothing; /* Prevent compiler warning */ - - if (!this->GetCount()) - return nothing; - - for (int i = 0; i <= this->GetCount(); i++) + switch (item.service) { - if (this->modules[i] == m) + case SERVICE_MODE: + if (!ServerInstance->Modes->DelMode(static_cast(&item))) + throw ModuleException("Mode "+std::string(item.name)+" does not exist."); + return; + case SERVICE_DATA: + case SERVICE_IOHOOK: { - return Instance->Config->module_names[i]; + for(std::multimap::iterator i = DataProviders.begin(); i != DataProviders.end(); ) + { + std::multimap::iterator curr = i++; + if (curr->second == &item) + DataProviders.erase(curr); + } + dynamic_reference_base::reset_all(); + return; } + default: + throw ModuleException("Cannot delete unknown service type"); } - return nothing; /* As above */ } -/* This is ugly, yes, but hash_map's arent designed to be - * addressed in this manner, and this is a bit of a kludge. - * Luckily its a specialist function and rarely used by - * many modules (in fact, it was specially created to make - * m_safelist possible, initially). - */ - -Channel* InspIRCd::GetChannelIndex(long index) +ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string& name) { - int target = 0; - for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++) + switch (type) { - if (index == target) - return n->second; + case SERVICE_DATA: + case SERVICE_IOHOOK: + { + std::multimap::iterator i = DataProviders.find(name); + if (i != DataProviders.end() && i->second->service == type) + return i->second; + return NULL; + } + // TODO implement finding of the other types + default: + throw ModuleException("Cannot find unknown service type"); } - return NULL; } -bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern) +dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::string& Name) + : name(Name), value(NULL), creator(Creator) { - 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); -} - -bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) -{ - return this->Parser->IsValidCommand(commandname, pcnt, user); + if (!dynrefs) + dynrefs = new std::vector; + dynrefs->push_back(this); } -void InspIRCd::AddCommand(Command *f) +dynamic_reference_base::~dynamic_reference_base() { - if (!this->Parser->CreateCommand(f)) + for(unsigned int i = 0; i < dynrefs->size(); i++) { - ModuleException err("Command "+std::string(f->command)+" already exists."); - throw (err); + if (dynrefs->at(i) == this) + { + unsigned int last = dynrefs->size() - 1; + if (i != last) + dynrefs->at(i) = dynrefs->at(last); + dynrefs->erase(dynrefs->begin() + last); + if (dynrefs->empty()) + { + delete dynrefs; + dynrefs = NULL; + } + return; + } } } -void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) +void dynamic_reference_base::SetProvider(const std::string& newname) { - this->Modes->Process(parameters,pcnt,user,true); + name = newname; + ClearCache(); } -void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream) +void dynamic_reference_base::lookup() { - std::string CompleteLine = LinePrefix; - std::string Word; - while (TextStream >> Word) - { - if (CompleteLine.length() + Word.length() + 3 > 500) - { - User->WriteServ(CompleteLine); - CompleteLine = LinePrefix; - } - CompleteLine = CompleteLine + Word + " "; - } - User->WriteServ(CompleteLine); + if (!*this) + throw ModuleException("Dynamic reference to '" + name + "' failed to resolve"); } -User* FindDescriptorHandler::Call(int socket) +dynamic_reference_base::operator bool() { - return reinterpret_cast(Server->SE->GetRef(socket)); + if (!value) + { + std::multimap::iterator i = ServerInstance->Modules->DataProviders.find(name); + if (i != ServerInstance->Modules->DataProviders.end()) + value = static_cast(i->second); + } + return (value != NULL); } -bool InspIRCd::AddMode(ModeHandler* mh) +void InspIRCd::SendMode(const std::vector& parameters, User *user) { - return this->Modes->AddMode(mh); + this->Modes->Process(parameters, user); } -bool InspIRCd::AddModeWatcher(ModeWatcher* mw) -{ - return this->Modes->AddModeWatcher(mw); -} -bool InspIRCd::DelModeWatcher(ModeWatcher* mw) +void InspIRCd::SendGlobalMode(const std::vector& parameters, User *user) { - return this->Modes->DelModeWatcher(mw); + Modes->Process(parameters, user); + if (!Modes->GetLastParse().empty()) + this->PI->SendMode(parameters[0], Modes->GetLastParseParams(), Modes->GetLastParseTranslate()); } bool InspIRCd::AddResolver(Resolver* r, bool cached) @@ -848,58 +596,52 @@ 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; } -ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) +const std::vector ModuleManager::GetAllModuleNames(int filter) { - /* 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; + std::vector retval; + for (std::map::iterator x = Modules.begin(); x != Modules.end(); ++x) + if (!filter || (x->second->GetVersion().Flags & filter)) + retval.push_back(x->first); + return retval; } - -ConfigReader::~ConfigReader() +ConfigReader::ConfigReader() { - if (this->errorlog) - delete this->errorlog; - if(this->privatehash) - delete this->data; + this->error = 0; + ServerInstance->Logs->Log("MODULE", DEBUG, "ConfigReader is deprecated in 2.0; " + "use ServerInstance->Config->ConfValue(\"key\") or ->ConfTags(\"key\") instead"); } -ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) +ConfigReader::~ConfigReader() { - 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; } +static ConfigTag* SlowGetTag(const std::string &tag, int index) +{ + ConfigTagList tags = ServerInstance->Config->ConfTags(tag); + while (tags.first != tags.second) + { + if (!index) + return tags.first->second; + tags.first++; + index--; + } + return NULL; +} 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* */ - std::string result; - - if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) + std::string result = default_value; + if (!SlowGetTag(tag, index)->readString(name, result, allow_linefeeds)) { this->error = CONF_VALUE_NOT_FOUND; } @@ -913,7 +655,8 @@ 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); + bool def = (default_value == "yes"); + return SlowGetTag(tag, index)->getBool(name, def); } bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) @@ -924,20 +667,15 @@ 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)) - { - this->error = CONF_VALUE_NOT_FOUND; - return 0; - } - + int v = atoi(default_value.c_str()); + int result = SlowGetTag(tag, index)->getInt(name, v); + if ((need_positive) && (result < 0)) { this->error = CONF_INT_NEGATIVE; return 0; } - + return result; } @@ -953,34 +691,21 @@ 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); -} - -int ConfigReader::EnumerateValues(const std::string &tag, int index) -{ - return ServerInstance->Config->ConfVarEnum(*this->data, tag, index); -} - -bool ConfigReader::Verify() -{ - return this->readerror; + ServerInstance->Logs->Log("MODULE", DEBUG, "Module is using ConfigReader::Enumerate on %s; this is slow!", + tag.c_str()); + int i=0; + while (SlowGetTag(tag, i)) i++; + return i; } - -FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) +FileReader::FileReader(const std::string &filename) { LoadFile(filename); } -FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance) +FileReader::FileReader() { } @@ -1010,13 +735,27 @@ void FileReader::CalcSize() void FileReader::LoadFile(const std::string &filename) { - file_cache c; - c.clear(); - if (ServerInstance->Config->ReadFile(c,filename.c_str())) + std::map::iterator file = ServerInstance->Config->Files.find(filename); + if (file != ServerInstance->Config->Files.end()) { - this->fc = c; - this->CalcSize(); + this->fc = file->second; + } + else + { + fc.clear(); + FILE* f = fopen(filename.c_str(), "r"); + if (!f) + return; + char linebuf[MAXBUF*10]; + while (fgets(linebuf, sizeof(linebuf), f)) + { + int len = strlen(linebuf); + if (len) + fc.push_back(std::string(linebuf, len - 1)); + } + fclose(f); } + CalcSize(); } @@ -1031,7 +770,7 @@ bool FileReader::Exists() std::string FileReader::GetLine(int x) { - if ((x<0) || ((unsigned)x>fc.size())) + if ((x<0) || ((unsigned)x>=fc.size())) return ""; return fc[x]; }