X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_dynamic.cpp;h=0d0042cabac0c9e93b6a2a53e9df07caa1f4c3f0;hb=02830985a18950497003f3392cf8d6cc30c15c50;hp=40bced74a211b89eab9ba4190583812108c938fa;hpb=c85a6bea77568739df592a90fba5ddf56cb5cf04;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp index 40bced74a..0d0042cab 100644 --- a/src/modmanager_dynamic.cpp +++ b/src/modmanager_dynamic.cpp @@ -1,206 +1,136 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf * - * 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 . */ + #include "inspircd.h" #include "xline.h" #include "socket.h" #include "socketengine.h" #include "command_parse.h" -#include "dns.h" #include "exitcodes.h" +#include -#ifndef WIN32 +#ifndef _WIN32 #include #endif #ifndef PURE_STATIC -bool ModuleManager::Load(const char* filename) +bool ModuleManager::Load(const std::string& filename, bool defer) { /* Don't allow people to specify paths for modules, it doesn't work as expected */ - if (strchr(filename, '/')) + if (filename.find('/') != std::string::npos) return false; - /* 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(ServerInstance->Config->ModPath.c_str()); - if (library) - { - /* Try and locate and load all modules matching the pattern */ - dirent* entry = NULL; - while (0 != (entry = readdir(library))) - { - if (entry->d_name[0] == '.') - continue; - if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map)) - { - 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 ? false : true); - } - char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename); - std::string filename_str = filename; + const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename); - if (!ServerConfig::FileExists(modfile)) + if (!FileSystem::FileExists(moduleFile)) { - LastModuleError = "Module file could not be found: " + filename_str; - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); + LastModuleError = "Module file could not be found: " + filename; + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError); return false; } - if (Modules.find(filename_str) != Modules.end()) + if (Modules.find(filename) != Modules.end()) { - LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); + LastModuleError = "Module " + filename + " is already loaded, cannot load a module twice!"; + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError); return false; } Module* newmod = NULL; - DLLManager* newhandle = new DLLManager(modfile); + DLLManager* newhandle = new DLLManager(moduleFile.c_str()); + ServiceList newservices; + if (!defer) + this->NewServices = &newservices; try { newmod = newhandle->CallInit(); + this->NewServices = NULL; if (newmod) { - newmod->ModuleSourceFile = filename_str; + newmod->ModuleSourceFile = filename; newmod->ModuleDLLManager = newhandle; - Modules[filename_str] = newmod; - newmod->init(); + newmod->dying = false; + Modules[filename] = newmod; + std::string version = newhandle->GetVersion(); + if (defer) + { + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)", + filename.c_str(), version.c_str()); + } + else + { + ConfigStatus confstatus; + + AttachAll(newmod); + AddServices(newservices); + newmod->init(); + newmod->ReadConfig(confstatus); - Version v = newmod->GetVersion(); - ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s", - filename, newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + Version v = newmod->GetVersion(); + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s", + filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + } } else { - LastModuleError = "Unable to load " + filename_str + ": " + newhandle->LastError(); - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); + LastModuleError = "Unable to load " + filename + ": " + newhandle->LastError(); + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError); delete newhandle; return false; } } catch (CoreException& modexcept) { + this->NewServices = NULL; + // failure in module constructor if (newmod) + { DoSafeUnload(newmod); - delete newmod; - delete newhandle; - LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->GlobalCulls.AddItem(newhandle); + } + else + delete newhandle; + LastModuleError = "Unable to load " + filename + ": " + modexcept.GetReason(); + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError); return false; } - this->ModCount++; - FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod)); - - /* 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(int tries = 0; tries < 20; tries++) - { - prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST; - for (std::map::iterator n = Modules.begin(); n != Modules.end(); ++n) - n->second->Prioritize(); - - if (prioritizationState == PRIO_STATE_LAST) - break; - if (tries == 19) - ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); - } - - ServerInstance->BuildISupport(); - return true; -} - -namespace { - struct UnloadAction : public HandlerBase0 - { - Module* const mod; - UnloadAction(Module* m) : mod(m) {} - void Call() - { - DLLManager* dll = mod->ModuleDLLManager; - ServerInstance->Modules->DoSafeUnload(mod); - ServerInstance->GlobalCulls.Apply(); - delete dll; - ServerInstance->GlobalCulls.AddItem(this); - } - }; - - struct ReloadAction : public HandlerBase0 - { - Module* const mod; - HandlerBase1* const callback; - ReloadAction(Module* m, HandlerBase1* c) - : mod(m), callback(c) {} - void Call() - { - DLLManager* dll = mod->ModuleDLLManager; - std::string name = mod->ModuleSourceFile; - ServerInstance->Modules->DoSafeUnload(mod); - ServerInstance->GlobalCulls.Apply(); - delete dll; - bool rv = ServerInstance->Modules->Load(name.c_str()); - if (callback) - callback->Call(rv); - ServerInstance->GlobalCulls.AddItem(this); - } - }; -} + if (defer) + return true; -bool ModuleManager::Unload(Module* mod) -{ - if (!CanUnload(mod)) - return false; - ServerInstance->AtomicActions.AddAction(new UnloadAction(mod)); + FOREACH_MOD(OnLoadModule, (newmod)); + PrioritizeHooks(); + ServerInstance->ISupport.Build(); return true; } -void ModuleManager::Reload(Module* mod, HandlerBase1* callback) -{ - if (CanUnload(mod)) - ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback)); - else - callback->Call(false); -} - /* We must load the modules AFTER initializing the socket engine, now */ -void ModuleManager::LoadAll() +void ModuleManager::LoadCoreModules(std::map& servicemap) { - ModCount = 0; - - printf("\nLoading core commands"); + std::cout << std::endl << "Loading core commands"; fflush(stdout); - DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); + DIR* library = opendir(ServerInstance->Config->Paths.Module.c_str()); if (library) { dirent* entry = NULL; @@ -208,57 +138,21 @@ void ModuleManager::LoadAll() { if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) { - printf("."); + std::cout << "."; fflush(stdout); - if (!Load(entry->d_name)) + this->NewServices = &servicemap[entry->d_name]; + + if (!Load(entry->d_name, true)) { - ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError()); - printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); + ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError()); + std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl; ServerInstance->Exit(EXIT_STATUS_MODULE); } } } closedir(library); - printf("\n"); - } - - ConfigTagList tags = ServerInstance->Config->ConfTags("module"); - for(ConfigIter i = tags.first; i != tags.second; ++i) - { - ConfigTag* tag = i->second; - std::string name = tag->getString("name"); - printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",name.c_str()); - - if (!this->Load(name.c_str())) - { - ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError()); - printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); - ServerInstance->Exit(EXIT_STATUS_MODULE); - } - } -} - -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++) - { - std::map::iterator i = Modules.begin(); - while (i != Modules.end()) - { - std::map::iterator me = i++; - if (CanUnload(me->second)) - { - DoSafeUnload(me->second); - } - } - ServerInstance->GlobalCulls.Apply(); + std::cout << std::endl; } }