X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=52a25d37cc8e0a43001776e402675eaf450364a1;hb=f1c95ba9301178017542afe9262a3f2f0528afd5;hp=2dafc88643565cf3729469dc59c4b6db4b61e567;hpb=9db7af579c46a9f0379fdf71fb773a0a76a94846;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 2dafc8864..52a25d37c 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -26,11 +26,23 @@ // Version is a simple class for holding a modules version number template<> -VersionBase::VersionBase(const std::string &modv, int flags, const std::string& rev) -: description(modv), version(rev), Flags(flags) +VersionBase::VersionBase(const std::string &desc, int flags) +: description(desc), Flags(flags) { } +template<> +VersionBase::VersionBase(const std::string &desc, int flags, const std::string& linkdata) +: description(desc), Flags(flags), link_data(linkdata) +{ +} + +template<> +bool VersionBase::CanLink(const std::string& other_data) +{ + return link_data == other_data; +} + Request::Request(Module* src, Module* dst, const char* idstr) : id(idstr), source(src), dest(dst) { @@ -56,12 +68,14 @@ CullResult Module::cull() { return classbase::cull(); } -Module::~Module() { } +Module::~Module() +{ +} ModResult Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; } -void Module::OnUserConnect(User*) { } +void Module::OnUserConnect(LocalUser*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } -void Module::OnUserDisconnect(User*) { } +void Module::OnUserDisconnect(LocalUser*) { } void Module::OnUserJoin(Membership*, bool, bool, CUList&) { } void Module::OnPostJoin(Membership*) { } void Module::OnUserPart(Membership*, std::string&, CUList&) { } @@ -85,10 +99,10 @@ ModResult Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASS void Module::OnLoadModule(Module*) { } void Module::OnUnloadModule(Module*) { } void Module::OnBackgroundTimer(time_t) { } -ModResult Module::OnPreCommand(std::string&, std::vector&, User *, bool, const std::string&) { return MOD_RES_PASSTHRU; } -void Module::OnPostCommand(const std::string&, const std::vector&, User *, CmdResult, const std::string&) { } -ModResult Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; } -ModResult Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; } +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&) { } +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; } @@ -99,8 +113,8 @@ 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(User*, const std::string&) { return MOD_RES_PASSTHRU; } -ModResult Module::OnChangeLocalUserGECOS(User*, const std::string&) { 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&) { } @@ -141,12 +155,14 @@ ModResult Module::OnUserList(User*, Channel*) { 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() { } +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*, ListenSocketBase*) { } -void Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { } +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*, Channel*, std::string&) { } ModResult Module::OnChannelRestrictionApply(User*, Channel*, const char*) { return MOD_RES_PASSTHRU; } ModuleManager::ModuleManager() : ModCount(0) @@ -159,6 +175,9 @@ ModuleManager::~ModuleManager() bool ModuleManager::Attach(Implementation i, Module* mod) { + if (Modules.find(mod->ModuleSourceFile) == Modules.end()) + ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is attaching to hook %d in constructor; this does not handle exceptions correctly!", i); + if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end()) return false; @@ -314,119 +333,6 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul return true; } -std::string& ModuleManager::LastError() -{ - return LastModuleError; -} - -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(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 (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; - - if (!ServerConfig::FileExists(modfile)) - { - LastModuleError = "Module file could not be found: " + filename_str; - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); - return false; - } - - if (Modules.find(filename_str) != Modules.end()) - { - LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); - return false; - } - - Module* newmod = NULL; - DLLManager* newhandle = new DLLManager(modfile); - - try - { - newmod = newhandle->callInit(); - - if (newmod) - { - newmod->ModuleSourceFile = filename_str; - newmod->ModuleDLLManager = newhandle; - Version v = newmod->GetVersion(); - - ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s", - filename, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); - - Modules[filename_str] = newmod; - } - else - { - LastModuleError = "Unable to load " + filename_str + ": " + newhandle->LastError(); - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); - delete newhandle; - return false; - } - } - catch (CoreException& modexcept) - { - // failure in module constructor - delete newmod; - delete newhandle; - LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); - ServerInstance->Logs->Log("MODULE", 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; -} - bool ModuleManager::CanUnload(Module* mod) { std::map::iterator modfind = Modules.find(mod->ModuleSourceFile); @@ -443,13 +349,6 @@ bool ModuleManager::CanUnload(Module* mod) ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - std::pair intercount = GetInterfaceInstanceCount(mod); - if (intercount.first > 0) - { - LastModuleError = "Failed to unload module " + mod->ModuleSourceFile + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'"; - ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); - return false; - } return true; } @@ -457,7 +356,7 @@ void ModuleManager::DoSafeUnload(Module* mod) { std::map::iterator modfind = Modules.find(mod->ModuleSourceFile); - std::vector items; + 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(); c++) @@ -473,6 +372,24 @@ void ModuleManager::DoSafeUnload(Module* mod) mod->OnCleanup(TYPE_USER,u->second); u->second->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); + } + for(unsigned int i = 0; i < ServerInstance->Modules->ActiveDynrefs.size(); i++) + ServerInstance->Modules->ActiveDynrefs[i]->ClearCache(); /* Tidy up any dangling resolvers */ ServerInstance->Res->CleanResolvers(mod); @@ -489,278 +406,118 @@ void ModuleManager::DoSafeUnload(Module* mod) ServerInstance->BuildISupport(); } -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()); - callback->Call(rv); - ServerInstance->GlobalCulls.AddItem(this); - } - }; -} - -bool ModuleManager::Unload(Module* mod) +std::string& ModuleManager::LastError() { - if (!CanUnload(mod)) - return false; - ServerInstance->AtomicActions.AddAction(new UnloadAction(mod)); - return true; + return LastModuleError; } -void ModuleManager::Reload(Module* mod, HandlerBase1* callback) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, User* user) { - if (CanUnload(mod)) - ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback)); - else - callback->Call(false); + return this->Parser->CallHandler(commandname, parameters, user); } -/* We must load the modules AFTER initializing the socket engine, now */ -void ModuleManager::LoadAll() +bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) { - ModCount = 0; - - printf("\nLoading core commands"); - fflush(stdout); - - DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); - if (library) - { - dirent* entry = NULL; - while (0 != (entry = readdir(library))) - { - if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) - { - printf("."); - fflush(stdout); - - if (!Load(entry->d_name)) - { - 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); - } - } - } - closedir(library); - printf("\n"); - } - - for(int count = 0;; count++) - { - ConfigTag* tag = ServerInstance->Config->ConfValue("module", count); - if (!tag) - break; - 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); - } - } + return this->Parser->IsValidCommand(commandname, pcnt, user); } -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()) +void ModuleManager::AddService(ServiceProvider& item) +{ + Module* owner = item.creator; + if (Modules.find(owner->ModuleSourceFile) == Modules.end()) + ServerInstance->Logs->Log("MODULE", DEFAULT, "Module is registering item %s in constructor; this does not handle exceptions correctly!", item.name.c_str()); + + switch (item.service) + { + case SERVICE_COMMAND: + if (!ServerInstance->Parser->AddCommand(static_cast(&item))) + throw ModuleException("Command "+std::string(item.name)+" already exists."); + return; + case SERVICE_CMODE: + case SERVICE_UMODE: + if (!ServerInstance->Modes->AddMode(static_cast(&item))) + throw ModuleException("Mode "+std::string(item.name)+" already exists."); + return; + case SERVICE_METADATA: + ServerInstance->Extensions.Register(static_cast(&item)); + return; + case SERVICE_DATA: + case SERVICE_IOHOOK: { - std::map::iterator me = i++; - if (CanUnload(me->second)) + DataProviders.insert(std::make_pair(item.name, &item)); + std::string::size_type slash = item.name.find('/'); + if (slash != std::string::npos) { - ServerInstance->GlobalCulls.AddItem(me->second); - Modules.erase(me); + DataProviders.insert(std::make_pair(item.name.substr(0, slash), &item)); + DataProviders.insert(std::make_pair(item.name.substr(slash + 1), &item)); } + return; } - ServerInstance->GlobalCulls.Apply(); - } -} - -bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) -{ - if (Features.find(FeatureName) == Features.end()) - { - Features[FeatureName] = Mod; - return true; - } - return false; -} - -bool ModuleManager::UnpublishFeature(const std::string &FeatureName) -{ - featurelist::iterator iter = Features.find(FeatureName); - - if (iter == Features.end()) - return false; - - Features.erase(iter); - return true; -} - -Module* ModuleManager::FindFeature(const std::string &FeatureName) -{ - featurelist::iterator iter = Features.find(FeatureName); - - if (iter == Features.end()) - return NULL; - - return iter->second; -} - -bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod) -{ - interfacelist::iterator iter = Interfaces.find(InterfaceName); - - if (iter == Interfaces.end()) - { - modulelist ml; - ml.push_back(Mod); - Interfaces[InterfaceName] = std::make_pair(0, ml); + default: + throw ModuleException("Cannot add unknown service type"); } - else - { - iter->second.second.push_back(Mod); - } - return true; } -bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod) +ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string& name) { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - - if (iter == Interfaces.end()) - return false; - - for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + switch (type) { - if (*x == Mod) + case SERVICE_DATA: + case SERVICE_IOHOOK: { - iter->second.second.erase(x); - if (iter->second.second.empty()) - Interfaces.erase(InterfaceName); - return true; + 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 false; } -modulelist* ModuleManager::FindInterface(const std::string &InterfaceName) +dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::string& Name) + : name(Name), value(NULL), creator(Creator) { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter == Interfaces.end()) - return NULL; - else - return &(iter->second.second); + ServerInstance->Modules->ActiveDynrefs.push_back(this); } -bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName) +dynamic_reference_base::~dynamic_reference_base() { - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter == Interfaces.end()) - return false; - else + for(unsigned int i = 0; i < ServerInstance->Modules->ActiveDynrefs.size(); i++) { - 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); - if (iter != Interfaces.end()) - iter->second.first++; - -} - -void ModuleManager::DoneWithInterface(const std::string &InterfaceName) -{ - interfacelist::iterator iter = Interfaces.find(InterfaceName); - if (iter != Interfaces.end()) - iter->second.first--; -} - -std::pair ModuleManager::GetInterfaceInstanceCount(Module* m) -{ - for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++) - { - for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++) + if (ServerInstance->Modules->ActiveDynrefs[i] == this) { - if (*x == m) - { - return std::make_pair(iter->second.first, iter->first); - } + unsigned int last = ServerInstance->Modules->ActiveDynrefs.size() - 1; + if (i != last) + ServerInstance->Modules->ActiveDynrefs[i] = ServerInstance->Modules->ActiveDynrefs[last]; + ServerInstance->Modules->ActiveDynrefs.erase(ServerInstance->Modules->ActiveDynrefs.begin() + last); + return; } } - return std::make_pair(0, ""); } -const std::string& ModuleManager::GetModuleName(Module* m) +void dynamic_reference_base::SetProvider(const std::string& newname) { - static std::string nothing; - - for (std::map::iterator n = Modules.begin(); n != Modules.end(); ++n) - { - if (n->second == m) - return n->first; - } - - return nothing; -} - -CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, User* user) -{ - return this->Parser->CallHandler(commandname, parameters, user); + name = newname; + ClearCache(); } -bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) +void dynamic_reference_base::lookup() { - return this->Parser->IsValidCommand(commandname, pcnt, user); + if (!*this) + throw ModuleException("Dynamic reference to '" + name + "' failed to resolve"); } -void InspIRCd::AddCommand(Command *f) +dynamic_reference_base::operator bool() { - if (!this->Parser->AddCommand(f)) + if (!value) { - throw ModuleException("Command "+std::string(f->command)+" already exists."); + std::multimap::iterator i = ServerInstance->Modules->DataProviders.find(name); + if (i != ServerInstance->Modules->DataProviders.end()) + value = static_cast(i->second); } + return value; } void InspIRCd::SendMode(const std::vector& parameters, User *user) @@ -768,52 +525,12 @@ void InspIRCd::SendMode(const std::vector& parameters, User *user) this->Modes->Process(parameters, user); } -void InspIRCd::DumpText(User* user, const std::string &text) -{ - if (IS_LOCAL(user)) - { - user->Write(text); - } - else - { - PI->PushToClient(user, text); - } -} -void InspIRCd::DumpText(User* user, const char *text, ...) +void InspIRCd::SendGlobalMode(const std::vector& parameters, User *user) { - va_list argsPtr; - char line[MAXBUF]; - - va_start(argsPtr, text); - vsnprintf(line, MAXBUF, text, argsPtr); - va_end(argsPtr); - - DumpText(user, std::string(line)); -} - -void InspIRCd::DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream) -{ - char line[MAXBUF]; - int start_pos = LinePrefix.length(); - int pos = start_pos; - memcpy(line, LinePrefix.data(), pos); - std::string Word; - while (TextStream >> Word) - { - int len = Word.length(); - if (pos + len + 12 > MAXBUF) - { - line[pos] = '\0'; - DumpText(user, std::string(line)); - pos = start_pos; - } - line[pos] = ' '; - memcpy(line + pos + 1, Word.data(), len); - pos += len + 1; - } - line[pos] = '\0'; - DumpText(user, std::string(line)); + Modes->Process(parameters, user); + if (!Modes->GetLastParse().empty()) + this->PI->SendMode(parameters[0], Modes->GetLastParseParams(), Modes->GetLastParseTranslate()); } bool InspIRCd::AddResolver(Resolver* r, bool cached) @@ -850,6 +567,8 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) ConfigReader::ConfigReader() { this->error = 0; + ServerInstance->Logs->Log("MODULE", DEBUG, "ConfigReader is deprecated in 2.0; " + "use ServerInstance->Config->ConfValue(\"key\") or ->ConfTags(\"key\") instead"); } @@ -857,12 +576,23 @@ ConfigReader::~ConfigReader() { } +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 = default_value; - if (!ServerInstance->Config->ConfValue(tag, index)->readString(name, result, allow_linefeeds)) + if (!SlowGetTag(tag, index)->readString(name, result, allow_linefeeds)) { this->error = CONF_VALUE_NOT_FOUND; } @@ -877,7 +607,7 @@ 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) { bool def = (default_value == "yes"); - return ServerInstance->Config->ConfValue(tag, index)->getBool(name, def); + return SlowGetTag(tag, index)->getBool(name, def); } bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) @@ -889,7 +619,7 @@ 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 v = atoi(default_value.c_str()); - int result = ServerInstance->Config->ConfValue(tag, index)->getInt(name, v); + int result = SlowGetTag(tag, index)->getInt(name, v); if ((need_positive) && (result < 0)) { @@ -917,7 +647,7 @@ int ConfigReader::Enumerate(const std::string &tag) ServerInstance->Logs->Log("MODULE", DEBUG, "Module is using ConfigReader::Enumerate on %s; this is slow!", tag.c_str()); int i=0; - while (ServerInstance->Config->ConfValue(tag, i)) i++; + while (SlowGetTag(tag, i)) i++; return i; } @@ -956,13 +686,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 = file->second; + } + else { - this->fc = c; - this->CalcSize(); + 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(); }