-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ * Copyright (C) 2007 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2003 randomdan <???@???>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* $Core */
#include "inspircd.h"
#include "xline.h"
#include "dns.h"
#include "exitcodes.h"
-#ifndef WIN32
+#ifndef _WIN32
#include <dirent.h>
#endif
+static std::vector<dynamic_reference_base*>* dynrefs = NULL;
-// version is a simple class for holding a modules version number
-Version::Version(const std::string &modv, int flags, int api_ver, const std::string& rev)
-: description(modv), version(rev), Flags(flags), API(api_ver)
-{
-}
-
-Request::Request(char* anydata, Module* src, Module* dst)
-: data(anydata), source(src), dest(dst)
-{
- /* Ensure that because this module doesnt support ID strings, it doesnt break modules that do
- * by passing them uninitialized pointers (could happen)
- */
- id = '\0';
-}
-
-Request::Request(Module* src, Module* dst, const char* idstr)
-: id(idstr), source(src), dest(dst)
-{
-}
-
-char* Request::GetData()
+void dynamic_reference_base::reset_all()
{
- return this->data;
+ if (!dynrefs)
+ return;
+ for(unsigned int i = 0; i < dynrefs->size(); i++)
+ (*dynrefs)[i]->ClearCache();
}
-const char* Request::GetId()
+// Version is a simple class for holding a modules version number
+Version::Version(const std::string &desc, int flags) : description(desc), Flags(flags)
{
- return this->id;
}
-Module* Request::GetSource()
+Version::Version(const std::string &desc, int flags, const std::string& linkdata)
+: description(desc), Flags(flags), link_data(linkdata)
{
- return this->source;
}
-Module* Request::GetDest()
+Request::Request(Module* src, Module* dst, const char* idstr)
+: id(idstr), source(src), dest(dst)
{
- return this->dest;
}
-const char* Request::Send()
+void Request::Send()
{
- if (this->dest)
- {
- return dest->OnRequest(this);
- }
- else
- {
- return NULL;
- }
+ if (dest)
+ dest->OnRequest(*this);
}
-Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }
+Event::Event(Module* src, const std::string &eventid) : source(src), id(eventid) { }
-char* Event::GetData()
+void Event::Send()
{
- return this->data;
+ FOREACH_MOD(I_OnEvent,OnEvent(*this));
}
-Module* Event::GetSource()
-{
- return this->source;
-}
+// These declarations define the behavours of the base class Module (which does nothing at all)
-char* Event::Send()
+Module::Module() { }
+CullResult Module::cull()
{
- FOREACH_MOD(I_OnEvent,OnEvent(this));
- return NULL;
+ return classbase::cull();
}
-
-std::string Event::GetEventID()
+Module::~Module()
{
- return this->id;
}
-
-// These declarations define the behavours of the base class Module (which does nothing at all)
-
-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&) { }
ModResult Module::OnPreMode(User*, User*, Channel*, const std::vector<std::string>&) { return MOD_RES_PASSTHRU; }
void Module::On005Numeric(std::string&) { }
ModResult Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; }
-void Module::OnLoadModule(Module*, const std::string&) { }
-void Module::OnUnloadModule(Module*, const std::string&) { }
+void Module::OnLoadModule(Module*) { }
+void Module::OnUnloadModule(Module*) { }
void Module::OnBackgroundTimer(time_t) { }
-ModResult Module::OnPreCommand(std::string&, std::vector<std::string>&, User *, bool, const std::string&) { return MOD_RES_PASSTHRU; }
-void Module::OnPostCommand(const std::string&, const std::vector<std::string>&, 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<std::string>&, LocalUser*, bool, const std::string&) { return MOD_RES_PASSTHRU; }
+void Module::OnPostCommand(const std::string&, const std::vector<std::string>&, LocalUser*, CmdResult, const std::string&) { }
+void Module::OnUserInit(LocalUser*) { }
+ModResult Module::OnCheckReady(LocalUser*) { return MOD_RES_PASSTHRU; }
+ModResult Module::OnUserRegister(LocalUser*) { return MOD_RES_PASSTHRU; }
ModResult Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; }
void Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { }
ModResult Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; }
ModResult Module::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*) { return; }
-const char* Module::OnRequest(Request*) { return NULL; }
+void Module::OnEvent(Event&) { }
+void Module::OnRequest(Request&) { }
ModResult Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; }
void Module::OnGlobalOper(User*) { }
void Module::OnPostConnect(User*) { }
ModResult Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; }
void Module::OnChannelDelete(Channel*) { }
ModResult Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; }
-ModResult Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; }
ModResult Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; }
-void Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
+void Module::OnBuildNeighborList(User*, UserChanList&, std::map<User*,bool>&) { }
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*) { }
-ModResult Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; }
-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<std::string>&, User*, std::string&) { }
+void Module::OnSetUserIP(LocalUser*) { }
ModuleManager::ModuleManager() : ModCount(0)
{
return true;
}
-bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module* which)
{
/** 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
* 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;
+ size_t my_pos = 0;
/* Locate our module. This is O(n) but it only occurs on module load so we're
* not too bothered about it
{
if (EventHandlers[i][x] == mod)
{
- source = x;
- found = true;
- break;
+ my_pos = x;
+ goto found_src;
}
}
/* Eh? this module doesnt exist, probably trying to set priority on an event
* theyre not attached to.
*/
- if (!found)
- return false;
+ return false;
+found_src:
+ size_t swap_pos = my_pos;
switch (s)
{
- /* Dummy value */
- case PRIORITY_DONTCARE:
- swap = false;
- break;
- /* Module wants to be first, sod everything else */
case PRIORITY_FIRST:
if (prioritizationState != PRIO_STATE_FIRST)
- swap = false;
+ return true;
else
swap_pos = 0;
- break;
- /* Module wants to be last. */
+ break;
case PRIORITY_LAST:
if (prioritizationState != PRIO_STATE_FIRST)
- swap = false;
- else if (EventHandlers[i].empty())
- swap_pos = 0;
+ return true;
else
swap_pos = EventHandlers[i].size() - 1;
- break;
- /* Place this module after a set of other modules */
+ break;
case PRIORITY_AFTER:
{
- /* Find the latest possible position */
- swap_pos = 0;
- swap = false;
- for (size_t x = 0; x != EventHandlers[i].size(); ++x)
+ /* Find the latest possible position, only searching AFTER our position */
+ for (size_t x = EventHandlers[i].size() - 1; x > my_pos; --x)
{
- for (size_t n = 0; n < sz; ++n)
+ if (EventHandlers[i][x] == which)
{
- if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x >= swap_pos) && (source <= swap_pos))
- {
- swap_pos = x;
- swap = true;
- }
+ swap_pos = x;
+ goto swap_now;
}
}
+ // didn't find it - either not loaded or we're already after
+ return 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 x = 0; x < my_pos; ++x)
{
- for (size_t n = 0; n < sz; ++n)
+ if (EventHandlers[i][x] == which)
{
- if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x <= swap_pos) && (source >= swap_pos))
- {
- swap = true;
- swap_pos = x;
- }
+ swap_pos = x;
+ goto swap_now;
}
}
+ // didn't find it - either not loaded or we're already before
+ return true;
}
- break;
}
+swap_now:
/* Do we need to swap? */
- if (swap && (swap_pos != source))
+ if (swap_pos != my_pos)
{
// We are going to change positions; we'll need to run again to verify all requirements
if (prioritizationState == PRIO_STATE_LAST)
/* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
int incrmnt = 1;
- if (source > swap_pos)
+ if (my_pos > swap_pos)
incrmnt = -1;
- for (unsigned int j = source; j != swap_pos; j += incrmnt)
+ for (unsigned int j = my_pos; j != swap_pos; j += incrmnt)
{
- if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+ if ((j + incrmnt > EventHandlers[i].size() - 1) || ((incrmnt == -1) && (j == 0)))
continue;
std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
return true;
}
-std::string& ModuleManager::LastError()
+bool ModuleManager::CanUnload(Module* mod)
{
- 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;
+ std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
- if (!ServerConfig::FileExists(modfile))
+ if ((modfind == Modules.end()) || (modfind->second != mod) || (mod->dying))
{
- LastModuleError = "Module file could not be found: " + filename_str;
+ LastModuleError = "Module " + mod->ModuleSourceFile + " is not loaded, cannot unload it!";
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
return false;
}
-
- if (Modules.find(filename_str) != Modules.end())
+ if (mod->GetVersion().Flags & VF_STATIC)
{
- LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
+ LastModuleError = "Module " + mod->ModuleSourceFile + " not unloadable (marked static)";
ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
return false;
}
- 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(modfile, "init_module");
- newmod = newhandle->CallInit();
-
- if (newmod)
- {
- newmod->ModuleSourceFile = filename_str;
- Version v = newmod->GetVersion();
+ mod->dying = true;
+ return true;
+}
- if (v.API != API_VERSION)
- {
- DetachAll(newmod);
- delete newmod;
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")";
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
- }
- else
- {
- ServerInstance->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]"));
- }
+void ModuleManager::DoSafeUnload(Module* mod)
+{
+ std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
- Modules[filename_str] = std::make_pair(newhandle, newmod);
- }
- else
- {
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
- }
- }
- /** XXX: Is there anything we can do about this mess? -- Brain */
- catch (LoadModuleException& modexcept)
+ std::vector<reference<ExtensionItem> > 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(); )
{
- DetachAll(newmod);
- if (newmod)
- delete newmod;
- if (newhandle)
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
+ Channel* chan = c->second;
+ ++c;
+ mod->OnCleanup(TYPE_CHANNEL, chan);
+ chan->doUnhookExtensions(items);
+ const UserMembList* users = chan->GetUsers();
+ for(UserMembCIter mi = users->begin(); mi != users->end(); mi++)
+ mi->second->doUnhookExtensions(items);
}
- catch (FindSymbolException& modexcept)
+ for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); )
{
- DetachAll(newmod);
- if (newmod)
- delete newmod;
- if (newhandle)
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
+ User* user = u->second;
+ // The module may quit the user (e.g. SSL mod unloading) and that will remove it from the container
+ ++u;
+ mod->OnCleanup(TYPE_USER, user);
+ user->doUnhookExtensions(items);
}
- catch (CoreException& modexcept)
+ for(char m='A'; m <= 'z'; m++)
{
- DetachAll(newmod);
- if (newmod)
- delete newmod;
- if (newhandle)
- delete newhandle;
- LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
+ 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);
}
-
- this->ModCount++;
- FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod, filename_str));
-
- /* 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++)
+ for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
{
- prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
- for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
- n->second.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);
+ std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
+ if (curr->second->creator == mod)
+ DataProviders.erase(curr);
}
- ServerInstance->BuildISupport();
- return true;
-}
+ dynamic_reference_base::reset_all();
-bool ModuleManager::Unload(const char* filename)
-{
- std::string filename_str(filename);
- std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
+ /* Tidy up any dangling resolvers */
+ ServerInstance->Res->CleanResolvers(mod);
- if (modfind != Modules.end())
- {
- if (modfind->second.second->GetVersion().Flags & VF_STATIC)
- {
- LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
- }
- std::pair<int,std::string> 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 + "'";
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
- }
+ FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(mod));
- std::vector<ExtensionItem*> items = Extensible::BeginUnregister(modfind->second.second);
- /* Give the module a chance to tidy out all its metadata */
- for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); c++)
- {
- modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
- c->second->doUnhookExtensions(items);
- const UserMembList* users = c->second->GetUsers();
- for(UserMembCIter mi = users->begin(); mi != users->end(); mi++)
- mi->second->doUnhookExtensions(items);
- }
- for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
- {
- modfind->second.second->OnCleanup(TYPE_USER,u->second);
- u->second->doUnhookExtensions(items);
- }
+ DetachAll(mod);
- /* Tidy up any dangling resolvers */
- ServerInstance->Res->CleanResolvers(modfind->second.second);
+ Modules.erase(modfind);
+ ServerInstance->GlobalCulls.AddItem(mod);
- FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
-
- this->DetachAll(modfind->second.second);
-
- ServerInstance->Parser->RemoveCommands(modfind->second.second);
-
- ServerInstance->GlobalCulls.AddItem(modfind->second.second);
- ServerInstance->GlobalCulls.AddItem(modfind->second.first);
- Modules.erase(modfind);
-
- ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
- this->ModCount--;
- ServerInstance->BuildISupport();
- return true;
- }
-
- LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
- ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
+ ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",mod->ModuleSourceFile.c_str());
+ this->ModCount--;
+ ServerInstance->BuildISupport();
}
-/* We must load the modules AFTER initializing the socket engine, now */
-void ModuleManager::LoadAll()
+void ModuleManager::UnloadAll()
{
- char configToken[MAXBUF];
- ModCount = -1;
-
- printf("\nLoading core commands");
- fflush(stdout);
-
- DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
- if (library)
+ /* 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++)
{
- dirent* entry = NULL;
- while (0 != (entry = readdir(library)))
+ std::map<std::string, Module*>::iterator i = Modules.begin();
+ while (i != Modules.end())
{
- if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
+ std::map<std::string, Module*>::iterator me = i++;
+ if (CanUnload(me->second))
{
- 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);
- }
+ DoSafeUnload(me->second);
}
}
- closedir(library);
- printf("\n");
- }
-
- for(int count = 0; count < ServerInstance->Config->ConfValueEnum("module"); count++)
- {
- ServerInstance->Config->ConfValue("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))
- {
- 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);
- }
+ ServerInstance->GlobalCulls.Apply();
}
}
-bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
+std::string& ModuleManager::LastError()
{
- if (Features.find(FeatureName) == Features.end())
- {
- Features[FeatureName] = Mod;
- return true;
- }
- return false;
+ return LastModuleError;
}
-bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
{
- featurelist::iterator iter = Features.find(FeatureName);
-
- if (iter == Features.end())
- return false;
-
- Features.erase(iter);
- return true;
+ return this->Parser->CallHandler(commandname, parameters, user);
}
-Module* ModuleManager::FindFeature(const std::string &FeatureName)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
{
- featurelist::iterator iter = Features.find(FeatureName);
-
- if (iter == Features.end())
- return NULL;
-
- return iter->second;
+ return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-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);
- }
- else
- {
- iter->second.second.push_back(Mod);
+void ModuleManager::AddService(ServiceProvider& item)
+{
+ switch (item.service)
+ {
+ case SERVICE_COMMAND:
+ if (!ServerInstance->Parser->AddCommand(static_cast<Command*>(&item)))
+ throw ModuleException("Command "+std::string(item.name)+" already exists.");
+ return;
+ case SERVICE_MODE:
+ if (!ServerInstance->Modes->AddMode(static_cast<ModeHandler*>(&item)))
+ throw ModuleException("Mode "+std::string(item.name)+" already exists.");
+ return;
+ case SERVICE_METADATA:
+ if (!ServerInstance->Extensions.Register(static_cast<ExtensionItem*>(&item)))
+ throw ModuleException("Extension " + std::string(item.name) + " already exists.");
+ return;
+ case SERVICE_DATA:
+ case SERVICE_IOHOOK:
+ {
+ DataProviders.insert(std::make_pair(item.name, &item));
+ std::string::size_type slash = item.name.find('/');
+ if (slash != std::string::npos)
+ {
+ DataProviders.insert(std::make_pair(item.name.substr(0, slash), &item));
+ DataProviders.insert(std::make_pair(item.name.substr(slash + 1), &item));
+ }
+ return;
+ }
+ default:
+ throw ModuleException("Cannot add unknown service type");
}
- return true;
}
-bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+void ModuleManager::DelService(ServiceProvider& item)
{
- 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 (item.service)
{
- if (*x == Mod)
+ case SERVICE_MODE:
+ if (!ServerInstance->Modes->DelMode(static_cast<ModeHandler*>(&item)))
+ throw ModuleException("Mode "+std::string(item.name)+" does not exist.");
+ return;
+ case SERVICE_DATA:
+ case SERVICE_IOHOOK:
{
- iter->second.second.erase(x);
- if (iter->second.second.empty())
- Interfaces.erase(InterfaceName);
- return true;
+ for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+ {
+ std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
+ if (curr->second == &item)
+ DataProviders.erase(curr);
+ }
+ dynamic_reference_base::reset_all();
+ return;
}
+ default:
+ throw ModuleException("Cannot delete unknown service type");
}
- return false;
}
-modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
+ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string& name)
{
- interfacelist::iterator iter = Interfaces.find(InterfaceName);
- if (iter == Interfaces.end())
- return NULL;
- else
- 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
+ switch (type)
{
- modulelist& ml = iter->second.second;
- modulelist::iterator mi = std::find(ml.begin(), ml.end(), mod);
- return (mi != ml.end());
+ case SERVICE_DATA:
+ case SERVICE_IOHOOK:
+ {
+ std::multimap<std::string, ServiceProvider*>::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");
}
}
-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)
+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())
- iter->second.first--;
+ if (!dynrefs)
+ dynrefs = new std::vector<dynamic_reference_base*>;
+ dynrefs->push_back(this);
}
-std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
+dynamic_reference_base::~dynamic_reference_base()
{
- for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
+ for(unsigned int i = 0; i < dynrefs->size(); i++)
{
- for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+ if (dynrefs->at(i) == this)
{
- if (*x == m)
+ unsigned int last = dynrefs->size() - 1;
+ if (i != last)
+ dynrefs->at(i) = dynrefs->at(last);
+ dynrefs->erase(dynrefs->begin() + last);
+ if (dynrefs->empty())
{
- return std::make_pair(iter->second.first, iter->first);
+ delete dynrefs;
+ dynrefs = NULL;
}
+ return;
}
}
- return std::make_pair(0, "");
-}
-
-const std::string& ModuleManager::GetModuleName(Module* m)
-{
- static std::string nothing;
-
- for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
- {
- if (n->second.second == m)
- return n->first;
- }
-
- return nothing;
-}
-
-/* This is ugly, yes, but hash_map's arent designed to be
- * addressed in this manner, and this is a bit of a kludge.
- * Luckily its a specialist function and rarely used by
- * many modules (in fact, it was specially created to make
- * m_safelist possible, initially).
- */
-
-Channel* InspIRCd::GetChannelIndex(long index)
-{
- int target = 0;
- for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
- {
- if (index == target)
- return n->second;
- }
- return NULL;
}
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
+void dynamic_reference_base::SetProvider(const std::string& newname)
{
- 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->CreateCommand(f))
+ if (!value)
{
- ModuleException err("Command "+std::string(f->command)+" already exists.");
- throw (err);
+ std::multimap<std::string, ServiceProvider*>::iterator i = ServerInstance->Modules->DataProviders.find(name);
+ if (i != ServerInstance->Modules->DataProviders.end())
+ value = static_cast<DataProvider*>(i->second);
}
+ return (value != NULL);
}
void InspIRCd::SendMode(const std::vector<std::string>& 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<std::string>& 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)
Module* ModuleManager::Find(const std::string &name)
{
- std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(name);
+ std::map<std::string, Module*>::iterator modfind = Modules.find(name);
if (modfind == Modules.end())
return NULL;
else
- return modfind->second.second;
+ return modfind->second;
}
const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
{
std::vector<std::string> retval;
- for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator x = Modules.begin(); x != Modules.end(); ++x)
- if (!filter || (x->second.second->GetVersion().Flags & filter))
+ for (std::map<std::string, Module*>::iterator x = Modules.begin(); x != Modules.end(); ++x)
+ if (!filter || (x->second->GetVersion().Flags & filter))
retval.push_back(x->first);
return retval;
}
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");
}
{
}
+static ConfigTag* SlowGetTag(const std::string &tag, int index)
+{
+ ConfigTagList tags = ServerInstance->Config->ConfTags(tag);
+ while (tags.first != tags.second)
+ {
+ if (!index)
+ return tags.first->second;
+ tags.first++;
+ index--;
+ }
+ return NULL;
+}
std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
{
- /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
- std::string result;
-
- if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds))
+ std::string result = default_value;
+ if (!SlowGetTag(tag, index)->readString(name, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
}
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
{
- return ServerInstance->Config->ConfValueBool(tag, name, default_value, index);
+ bool def = (default_value == "yes");
+ return SlowGetTag(tag, index)->getBool(name, def);
}
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
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(tag, name, default_value, index, result))
- {
- this->error = CONF_VALUE_NOT_FOUND;
- return 0;
- }
+ int v = atoi(default_value.c_str());
+ int result = SlowGetTag(tag, index)->getInt(name, v);
if ((need_positive) && (result < 0))
{
int ConfigReader::Enumerate(const std::string &tag)
{
- return ServerInstance->Config->ConfValueEnum(tag);
-}
-
-int ConfigReader::EnumerateValues(const std::string &tag, int index)
-{
- return ServerInstance->Config->ConfVarEnum(tag, index);
+ ServerInstance->Logs->Log("MODULE", DEBUG, "Module is using ConfigReader::Enumerate on %s; this is slow!",
+ tag.c_str());
+ int i=0;
+ while (SlowGetTag(tag, i)) i++;
+ return i;
}
FileReader::FileReader(const std::string &filename)
void FileReader::LoadFile(const std::string &filename)
{
- file_cache c;
- c.clear();
- if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+ std::map<std::string, file_cache>::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();
}
std::string FileReader::GetLine(int x)
{
- if ((x<0) || ((unsigned)x>fc.size()))
+ if ((x<0) || ((unsigned)x>=fc.size()))
return "";
return fc[x];
}
projects / user / henk / code / inspircd.git / blobdiff