X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=29d4b555512b18c1c508a28aeac2055f3273893d;hb=c275233c7c356058c812ed3906a833b678e9de69;hp=5639f308836e400c0bdf3948fdaf56e8120c6a93;hpb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 5639f3088..29d4b5555 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,8 +11,9 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "socket.h" #include "socketengine.h" @@ -24,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) { } @@ -64,7 +66,7 @@ Module* Request::GetDest() return this->dest; } -char* Request::Send() +const char* Request::Send() { if (this->dest) { @@ -102,102 +104,101 @@ 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() { } -void Module::OnUserConnect(User* user) { } -void Module::OnUserQuit(User* user, const std::string& message, const std::string &oper_message) { } -void Module::OnUserDisconnect(User* user) { } -void Module::OnUserJoin(User* user, Channel* channel, bool &silent) { } -void Module::OnPostJoin(User* user, Channel* channel) { } -void Module::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { } -void Module::OnRehash(User* user, const std::string ¶meter) { } -void Module::OnServerRaw(std::string &raw, bool inbound, User* user) { } -int Module::OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { return 0; } -void Module::OnMode(User* user, void* dest, int target_type, const std::string &text) { } -Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } -void Module::OnOper(User* user, const std::string &opertype) { } -void Module::OnPostOper(User* user, const std::string &opertype) { } -void Module::OnInfo(User* user) { } -void Module::OnWhois(User* source, User* dest) { } -int Module::OnUserPreInvite(User* source,User* dest,Channel* channel) { return 0; } -int Module::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNick(User* user, const std::string &newnick) { return 0; } -void Module::OnUserPostNick(User* user, const std::string &oldnick) { } -int Module::OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { return ACR_DEFAULT; } -void Module::On005Numeric(std::string &output) { } -int Module::OnKill(User* source, User* dest, const std::string &reason) { return 0; } -void Module::OnLoadModule(Module* mod,const std::string &name) { } -void Module::OnUnloadModule(Module* mod,const std::string &name) { } -void Module::OnBackgroundTimer(time_t curtime) { } -int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { return 0; } -void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line) { } -bool Module::OnCheckReady(User* user) { return true; } -int Module::OnUserRegister(User* user) { return 0; } -int Module::OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { return 0; } -void Module::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { } -int Module::OnCheckInvite(User* user, Channel* chan) { return 0; } -int Module::OnCheckKey(User* user, Channel* chan, const std::string &keygiven) { return 0; } -int Module::OnCheckLimit(User* user, Channel* chan) { return 0; } -int Module::OnCheckBan(User* user, Channel* chan) { return 0; } -int Module::OnStats(char symbol, User* user, string_list &results) { return 0; } -int Module::OnChangeLocalUserHost(User* user, const std::string &newhost) { return 0; } -int Module::OnChangeLocalUserGECOS(User* user, const std::string &newhost) { return 0; } -int Module::OnLocalTopicChange(User* user, Channel* chan, const std::string &topic) { return 0; } -void Module::OnEvent(Event* event) { return; } -char* Module::OnRequest(Request* request) { return NULL; } -int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; } -void Module::OnGlobalOper(User* user) { } -void Module::OnPostConnect(User* user) { } -int Module::OnAddBan(User* source, Channel* channel,const std::string &banmask) { return 0; } -int Module::OnDelBan(User* source, Channel* channel,const std::string &banmask) { return 0; } -void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { } -int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; } -void Module::OnRawSocketClose(int fd) { } -void Module::OnRawSocketConnect(int fd) { } -int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; } -void Module::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason) { } -void Module::OnUserInvite(User* source,User* dest,Channel* channel) { } -void Module::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) { } -void Module::OnGetServerDescription(const std::string &servername,std::string &description) { } -void Module::OnSyncUser(User* user, Module* proto, void* opaque) { } -void Module::OnSyncChannel(Channel* chan, Module* proto, void* opaque) { } -void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { } -void Module::OnSyncChannelMetaData(Channel* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { } -void Module::OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { } -void Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { } -void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { } -void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { } -void Module::OnWallops(User* user, const std::string &text) { } -void Module::OnChangeHost(User* user, const std::string &newhost) { } -void Module::OnChangeName(User* user, const std::string &gecos) { } -void Module::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask) { } -void Module::OnAddKLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask) { } -void Module::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnDelGLine(User* source, const std::string &hostmask) { } -void Module::OnDelZLine(User* source, const std::string &ipmask) { } -void Module::OnDelKLine(User* source, const std::string &hostmask) { } -void Module::OnDelQLine(User* source, const std::string &nickmask) { } -void Module::OnDelELine(User* source, const std::string &hostmask) { } -void Module::OnCleanup(int target_type, void* item) { } -void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; } -void Module::OnChannelDelete(Channel* chan) { } -Priority Module::Prioritize() { return PRIORITY_DONTCARE; } -void Module::OnSetAway(User* user) { } -void Module::OnCancelAway(User* user) { } -int Module::OnUserList(User* user, Channel* Ptr, CUList* &userlist) { return 0; } -int Module::OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { return 0; } -void Module::OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { } +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, bool&) { } +void Module::OnPostJoin(User*, Channel*) { } +void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } +void Module::OnRehash(User*, const std::string&) { } +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&, const std::string &) { } +void Module::OnInfo(User*) { } +void Module::OnWhois(User*, User*) { } +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; } +void Module::OnUserPostNick(User*, const std::string&) { } +int Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; } +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&) { } +void Module::OnBackgroundTimer(time_t) { } +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; } +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; } +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; } +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*, 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*, 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*, 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*) { } +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* user) { } +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) +ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) { } @@ -205,9 +206,158 @@ ModuleManager::~ModuleManager() { } -const char* ModuleManager::LastError() +bool ModuleManager::Attach(Implementation i, Module* mod) +{ + if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end()) + return false; + + EventHandlers[i].push_back(mod); + return true; +} + +bool ModuleManager::Detach(Implementation i, Module* mod) +{ + EventHandlerIter x = std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod); + + if (x == EventHandlers[i].end()) + return false; + + EventHandlers[i].erase(x); + return true; +} + +void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz) +{ + for (size_t n = 0; n < sz; ++n) + Attach(i[n], mod); +} + +void ModuleManager::DetachAll(Module* mod) +{ + for (size_t n = I_BEGIN + 1; n != I_END; ++n) + Detach((Implementation)n, mod); +} + +bool ModuleManager::SetModulePriority(Module* mod, Priority s) +{ + for (size_t n = I_BEGIN + 1; n != I_END; ++n) + SetPriority(mod, (Implementation)n, s); + + return true; +} + +bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t 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 = 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) + { + source = x; + found = true; + break; + } + } + + /* Eh? this module doesnt exist, probably trying to set priority on an event + * theyre not attached to. + */ + if (!found) + return false; + + switch (s) + { + /* Dummy value */ + case PRIORITY_DONTCARE: + swap = false; + break; + /* Module wants to be first, sod everything else */ + case PRIORITY_FIRST: + swap_pos = 0; + break; + /* Module is submissive and wants to be last... awww. */ + case PRIORITY_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 PRIORITY_AFTER: + { + /* Find the latest possible position */ + swap_pos = 0; + swap = false; + for (size_t x = 0; x != EventHandlers[i].size(); ++x) + { + for (size_t n = 0; n < sz; ++n) + { + if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x >= swap_pos) && (source <= swap_pos)) + { + swap_pos = x; + swap = true; + } + } + } + } + break; + /* Place this module before a set of other modules */ + case PRIORITY_BEFORE: + { + swap_pos = EventHandlers[i].size() - 1; + swap = false; + for (size_t x = 0; x != EventHandlers[i].size(); ++x) + { + for (size_t n = 0; n < sz; ++n) + { + if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x <= swap_pos) && (source >= swap_pos)) + { + swap = true; + swap_pos = x; + } + } + } + } + break; + } + + /* Do we need to swap? */ + if (swap && (swap_pos != source)) + { + /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ + int incrmnt = 1; + + 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; +} + +std::string& ModuleManager::LastError() { - return MODERR; + return LastModuleError; } bool ModuleManager::Load(const char* filename) @@ -224,9 +374,9 @@ 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)) + if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map)) { if (!this->Load(entry->d_name)) n_match++; @@ -238,7 +388,7 @@ 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]; @@ -247,335 +397,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()) - { - Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); - snprintf(MODERR, MAXBUF, "Module already loaded"); + + if (Modules.find(filename_str) != Modules.end()) + { + 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 %s)%s", filename, v.API, v.version.c_str(), (!(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]; + 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)); - // 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(); - return true; -} -bool ModuleManager::EraseHandle(unsigned int j) -{ - ModuleHandleList::iterator iter; - - if((j < 0) || (j >= handles.size())) - { - return false; - } - - iter = handles.begin() + j; + this->ModCount++; + FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str)); - if(*iter) - { - delete *iter; - handles.erase(iter); - handles.push_back(NULL); - } + /* 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::EraseModule(unsigned int j) +bool ModuleManager::Unload(const char* filename) { - bool success = false; - + std::string filename_str(filename); + std::map >::iterator modfind = Modules.find(filename); + + if (modfind != Modules.end()) { - ModuleList::iterator iter; - - if((j < 0) || (j >= modules.size())) + if (modfind->second.second->GetVersion().Flags & VF_STATIC) { + LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; + Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - - iter = modules.begin() + j; - - if(*iter) - { - delete *iter; - modules.erase(iter); - modules.push_back(NULL); - success = true; - } - } - - { - std::vector::iterator iter; - - if((j < 0) || (j >= Instance->Config->module_names.size())) + 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; } - - iter = Instance->Config->module_names.begin() + j; - - Instance->Config->module_names.erase(iter); - success = true; - } - - return success; -} -void ModuleManager::MoveTo(std::string modulename,int slot) -{ - unsigned int v2 = 256; - - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) - { - if (Instance->Config->module_names[v] == modulename) + /* Give the module a chance to tidy out all its metadata */ + for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++) { - // found an instance, swap it with the item at the end - v2 = v; - break; + modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); } - } - 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++) + for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) { - 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; + modfind->second.second->OnCleanup(TYPE_USER,u->second); } - } -} -void ModuleManager::MoveAfter(std::string modulename, std::string after) -{ - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) - { - if (Instance->Config->module_names[v] == after) - { - MoveTo(modulename, v); - return; - } - } -} + /* Tidy up any dangling resolvers */ + Instance->Res->CleanResolvers(modfind->second.second); -void ModuleManager::MoveBefore(std::string modulename, std::string before) -{ - for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++) - { - if (Instance->Config->module_names[v] == before) - { - if (v > 0) - { - MoveTo(modulename, v-1); - } - else - { - MoveTo(modulename, v); - } - return; - } - } -} -void ModuleManager::MoveToFirst(std::string modulename) -{ - MoveTo(modulename,0); -} + FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); -void ModuleManager::MoveToLast(std::string modulename) -{ - MoveTo(modulename,this->GetCount()); -} + this->DetachAll(modfind->second.second); -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); - } - - /* Tidy up any dangling resolvers */ - Instance->Res->CleanResolvers(modules[j]); + Instance->Parser->RemoveCommands(filename); - FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j])); + delete modfind->second.second; + delete modfind->second.first; + Modules.erase(modfind); - for(int t = 0; t < 255; t++) - { - Instance->Config->global_implementation[t] -= Instance->Config->implement_lists[j][t]; - } - - /* We have to renumber implement_lists after unload because the module numbers change! - */ - for(int j2 = j; j2 < 254; j2++) - { - for(int t = 0; t < 255; t++) - { - Instance->Config->implement_lists[j2][t] = Instance->Config->implement_lists[j2+1][t]; - } - } - - // 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; } @@ -583,47 +564,20 @@ 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++) { 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); -} - -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; -} -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) + if (!this->Load(configToken)) { - return ((j << 8) | PRIORITY_BEFORE); + 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); } } - return PRIORITY_DONTCARE; } bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) @@ -639,7 +593,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; @@ -666,14 +620,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) @@ -705,6 +657,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); @@ -737,19 +702,15 @@ std::pair ModuleManager::GetInterfaceInstanceCount(Module* m) const std::string& ModuleManager::GetModuleName(Module* m) { - static std::string nothing; /* Prevent compiler warning */ + static std::string nothing; - if (!this->GetCount()) - return 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 @@ -770,14 +731,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) @@ -794,12 +750,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; @@ -820,21 +776,6 @@ User* FindDescriptorHandler::Call(int socket) return reinterpret_cast(Server->SE->GetRef(socket)); } -bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode) -{ - return this->Modes->AddMode(mh,mode); -} - -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) @@ -847,82 +788,32 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached) } } -void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) -{ - XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str()); - XLines->apply_lines(APPLY_GLINES); -} - -void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname) -{ - XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str()); - XLines->apply_lines(APPLY_QLINES); -} - -void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr) -{ - XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str()); - XLines->apply_lines(APPLY_ZLINES); -} - -void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) -{ - XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str()); - XLines->apply_lines(APPLY_KLINES); -} - -void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask) -{ - XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str()); -} - -bool InspIRCd::DelGLine(const std::string &hostmask) -{ - return XLines->del_gline(hostmask.c_str()); -} - -bool InspIRCd::DelQLine(const std::string &nickname) -{ - return XLines->del_qline(nickname.c_str()); -} - -bool InspIRCd::DelZLine(const std::string &ipaddr) -{ - return XLines->del_zline(ipaddr.c_str()); -} - -bool InspIRCd::DelKLine(const std::string &hostmask) +Module* ModuleManager::Find(const std::string &name) { - return XLines->del_kline(hostmask.c_str()); -} + std::map >::iterator modfind = Modules.find(name); -bool InspIRCd::DelELine(const std::string &hostmask) -{ - return XLines->del_eline(hostmask.c_str()); + if (modfind == Modules.end()) + return NULL; + else + return modfind->second.second; } -Module* ModuleManager::Find(const std::string &name) +const std::vector ModuleManager::GetAllModuleNames(int filter) { - for (int i = 0; i <= this->GetCount(); i++) - { - if (Instance->Config->module_names[i] == name) - { - return this->modules[i]; - } - } - return NULL; + 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; this->privatehash = false; + this->error = 0; } @@ -943,17 +834,19 @@ 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; + this->error = 0; } 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)) { this->error = CONF_VALUE_NOT_FOUND; @@ -980,19 +873,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)) { this->error = CONF_VALUE_NOT_FOUND; return 0; } - + if ((need_positive) && (result < 0)) { this->error = CONF_INT_NEGATIVE; return 0; } - + return result; } @@ -1010,7 +903,7 @@ long ConfigReader::GetError() void ConfigReader::DumpErrors(bool bail, User* user) { - ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user); + ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user->uuid); }