X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=0142749cfe7a23806d68d093fc5006d5c3baaef6;hb=f1271614679843191bb247c0db2716acb5ac0e4b;hp=ef0de9471804f0fa3a7abad9d5a450e42cd92a04;hpb=051aa21ed3c4583d19862055e2128b418adea633;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index ef0de9471..0142749cf 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -106,10 +106,12 @@ std::string Event::GetEventID() Module::Module(InspIRCd* Me) : ServerInstance(Me) { } Module::~Module() { } +void Module::OnReadConfig(ServerConfig*, ConfigReader*) { } +int Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; } void Module::OnUserConnect(User*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } void Module::OnUserDisconnect(User*) { } -void Module::OnUserJoin(User*, Channel*, bool&) { } +void Module::OnUserJoin(User*, Channel*, bool, bool&) { } void Module::OnPostJoin(User*, Channel*) { } void Module::OnUserPart(User*, Channel*, const std::string&, bool&) { } void Module::OnRehash(User*, const std::string&) { } @@ -118,7 +120,7 @@ int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return void Module::OnMode(User*, void*, int, const std::string&) { } Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } void Module::OnOper(User*, const std::string&) { } -void Module::OnPostOper(User*, const std::string&) { } +void Module::OnPostOper(User*, const std::string&, const std::string &) { } void Module::OnInfo(User*) { } void Module::OnWhois(User*, User*) { } int Module::OnUserPreInvite(User*, User*, Channel*) { return 0; } @@ -138,6 +140,7 @@ 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) { 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; } @@ -148,7 +151,7 @@ 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; } +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; } @@ -177,7 +180,9 @@ void Module::OnChangeHost(User*, const std::string&) { } void Module::OnChangeName(User*, const std::string&) { } void Module::OnAddLine(User*, XLine*) { } void Module::OnDelLine(User*, XLine*) { } +void Module::OnExpireLine(XLine*) { } void Module::OnCleanup(int, void*) { } +int Module::OnChannelPreDelete(Channel*) { return 0; } void Module::OnChannelDelete(Channel*) { } void Module::OnSetAway(User*) { } void Module::OnCancelAway(User*) { } @@ -191,8 +196,6 @@ void Module::OnText(User*, void*, int, const std::string&, char, CUList&) { } ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) { - for (int n = I_BEGIN; n != I_END; ++n) - EventHandlers.push_back(std::vector()); } ModuleManager::~ModuleManager() @@ -241,13 +244,6 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s) bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz) { - if (GetModuleName(mod) != "m_spanningtree.so") - Instance->Log(DEBUG,"ModuleManager::SetPriority called by %s, priority state %s num_modules=%u", GetModuleName(mod).c_str(), s == PRIO_BEFORE ? "PRIO_BEFORE" : - s == PRIO_AFTER ? "PRIO_AFTER" : - s == PRIO_LAST ? "PRIO_LAST" : - s == PRIO_FIRST ? "PRIO_FIRST" : "", - sz); - /** 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 @@ -278,20 +274,6 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, if (!found) return false; - Instance->Log(DEBUG,"ModuleManager::SetPriority: My position: %u", source); - - /* Debug stuff. We will probably comment this out some time */ - if (modules) - { - for (size_t n = 0; n < sz; ++n) - { - if (modules[n]) - Instance->Log(DEBUG," Listed Module: [%08x] %s", modules[n], GetModuleName(modules[n]).c_str()); - else - Instance->Log(DEBUG," [null module]"); - } - } - switch (s) { /* Dummy value */ @@ -350,26 +332,14 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, /* Do we need to swap? */ if (swap && (swap_pos != source)) - { std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]); - Instance->Log(DEBUG,"Swap locations %u and %u", swap_pos, source); - } - else - Instance->Log(DEBUG,"No need to swap"); - - /* Debug stuff. We wont need this some day soon (tm) */ - Instance->Log(DEBUG,"New ordering:"); - for (size_t x = 0; x != EventHandlers[i].size(); ++x) - { - Instance->Log(DEBUG," [%08x] %s", EventHandlers[i][x], GetModuleName(EventHandlers[i][x]).c_str()); - } return true; } -const char* ModuleManager::LastError() +std::string& ModuleManager::LastError() { - return MODERR; + return LastModuleError; } bool ModuleManager::Load(const char* filename) @@ -409,22 +379,22 @@ 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 " + filename_str + " is not within the modules directory."; + Instance->Log(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->Log(DEFAULT, LastModuleError); return false; } if (Modules.find(filename_str) != Modules.end()) { - Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile); - snprintf(MODERR, MAXBUF, "Module already loaded"); + LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; + Instance->Log(DEFAULT, LastModuleError); return false; } @@ -439,15 +409,17 @@ bool ModuleManager::Load(const char* filename) newhandle = new ircd_module(Instance, modfile, "init_module"); newmod = newhandle->CallInit(); - if(newmod) + if (newmod) { Version v = newmod->GetVersion(); if (v.API != API_VERSION) { + DetachAll(newmod); delete newmod; - 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->Log(DEFAULT, LastModuleError); return false; } else @@ -459,30 +431,47 @@ bool ModuleManager::Load(const char* filename) } 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->Log(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->Log(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->Log(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->Log(DEFAULT, LastModuleError); return false; } - + this->ModCount++; FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str)); @@ -499,26 +488,22 @@ bool ModuleManager::Load(const char* filename) bool ModuleManager::Unload(const char* filename) { - std::string filename_str = filename; + std::string filename_str(filename); std::map >::iterator modfind = Modules.find(filename); if (modfind != Modules.end()) { if (modfind->second.second->GetVersion().Flags & VF_STATIC) { - Instance->Log(DEFAULT,"Failed to unload STATIC module %s",filename); - snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)"); + LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; + Instance->Log(DEFAULT, LastModuleError); return false; } std::pair intercount = GetInterfaceInstanceCount(modfind->second.second); 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()); + LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'"; + Instance->Log(DEFAULT, LastModuleError); return false; } @@ -527,7 +512,7 @@ bool ModuleManager::Unload(const char* filename) { modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); } - for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++) + for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) { modfind->second.second->OnCleanup(TYPE_USER,u->second); } @@ -552,8 +537,8 @@ bool ModuleManager::Unload(const char* filename) 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->Log(DEFAULT, LastModuleError); return false; } @@ -570,13 +555,11 @@ void ModuleManager::LoadAll() if (!this->Load(configToken)) { - Instance->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->LastError()); - printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->LastError()); + Instance->Log(DEFAULT, this->LastError()); + printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); Instance->Exit(EXIT_STATUS_MODULE); } } - printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", (this->GetCount()+1), (this->GetCount()+1) == 1 ? " has" : "s have"); - Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount()+1); } bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) @@ -658,6 +641,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); @@ -748,7 +744,7 @@ void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) this->Modes->Process(parameters,pcnt,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; @@ -769,21 +765,6 @@ User* FindDescriptorHandler::Call(int socket) return reinterpret_cast(Server->SE->GetRef(socket)); } -bool InspIRCd::AddMode(ModeHandler* mh) -{ - return this->Modes->AddMode(mh); -} - -bool InspIRCd::AddModeWatcher(ModeWatcher* mw) -{ - return this->Modes->AddModeWatcher(mw); -} - -bool InspIRCd::DelModeWatcher(ModeWatcher* mw) -{ - return this->Modes->DelModeWatcher(mw); -} - bool InspIRCd::AddResolver(Resolver* r, bool cached) { if (!cached) @@ -817,10 +798,6 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) { - /* Is there any reason to load the entire config file again here? - * it's needed if they specify another config file, but using the - * default one we can just use the global config data - pre-parsed! - */ this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out); this->error = CONF_NO_ERROR; this->data = &ServerInstance->Config->config_data; @@ -845,7 +822,11 @@ 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); + for (int pass = 0; pass < 2; pass++) + { + /*** XXX: Can return a 'not ready yet!' code! */ + this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass); + } if (!this->readerror) this->error = CONF_FILE_NOT_FOUND; }