* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "inspircd_config.h"
+/* $Core */
+
#include "inspircd.h"
-#include "configreader.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "mode.h"
#include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
#include "socket.h"
#include "socketengine.h"
-#include "typedefs.h"
-#include "modules.h"
#include "command_parse.h"
#include "dns.h"
+#include "exitcodes.h"
-extern ServerConfig *Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
-extern time_t TIME;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern command_table cmdlist;
-
-class Server;
-
-featurelist Features;
+#ifndef WIN32
+ #include <dirent.h>
+#endif
// version is a simple class for holding a modules version number
-
-Version::Version(int major, int minor, int revision, int build, int flags)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags)
-{
-}
-
-// admin is a simple class for holding a server's administrative info
-
-Admin::Admin(std::string name, std::string email, std::string nick)
-: Name(name), Email(email), Nick(nick)
+Version::Version(const std::string &sversion, int flags, int api_ver)
+: version(sversion), Flags(flags), API(api_ver)
{
}
Request::Request(Module* src, Module* dst, const char* idstr)
: id(idstr), source(src), dest(dst)
{
-};
+}
char* Request::GetData()
{
return this->dest;
}
-char* Request::Send()
+const char* Request::Send()
{
if (this->dest)
{
}
}
-Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { };
+Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }
char* Event::GetData()
{
return this->source;
}
-char* Event::Send()
+char* Event::Send(InspIRCd* ServerInstance)
{
FOREACH_MOD(I_OnEvent,OnEvent(this));
return NULL;
// These declarations define the behavours of the base class Module (which does nothing at all)
- Module::Module(Server* Me) { }
- Module::~Module() { }
-void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, const std::string& message) { }
-void Module::OnUserDisconnect(userrec* user) { }
-void Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
-void Module::OnRehash(const std::string ¶meter) { }
-void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
-Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void Module::OnOper(userrec* user, const std::string &opertype) { };
-void Module::OnPostOper(userrec* user, const std::string &opertype) { };
-void Module::OnInfo(userrec* user) { };
-void Module::OnWhois(userrec* source, userrec* dest) { };
-int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
-int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; };
-void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { };
-int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; };
-void Module::On005Numeric(std::string &output) { };
-int Module::OnKill(userrec* source, userrec* 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, userrec *user, bool validated) { return 0; };
-bool Module::OnCheckReady(userrec* user) { return true; };
-void Module::OnUserRegister(userrec* user) { };
-int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
-int Module::OnRawMode(userrec* user, chanrec* chan, char mode, const std::string ¶m, bool adding, int pcnt) { return 0; };
-int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
-int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
-int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; };
-int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; };
-int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; };
-int Module::OnLocalTopicChange(userrec* user, chanrec* 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) { return 0; };
-void Module::OnGlobalOper(userrec* user) { };
-void Module::OnGlobalConnect(userrec* user) { };
-int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { };
-int Module::OnRawSocketWrite(int fd, char* buffer, int count) { return 0; };
-void Module::OnRawSocketClose(int fd) { };
-int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
-void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { };
-void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
-void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
-void Module::OnGetServerDescription(const std::string &servername,std::string &description) { };
-void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
-void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
-void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
-void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
-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(userrec* user, const std::string &text) { };
-void Module::OnChangeHost(userrec* user, const std::string &newhost) { };
-void Module::OnChangeName(userrec* user, const std::string &gecos) { };
-void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { };
-void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { };
-void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnDelGLine(userrec* source, const std::string &hostmask) { };
-void Module::OnDelZLine(userrec* source, const std::string &ipmask) { };
-void Module::OnDelKLine(userrec* source, const std::string &hostmask) { };
-void Module::OnDelQLine(userrec* source, const std::string &nickmask) { };
-void Module::OnDelELine(userrec* 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(chanrec* chan) { };
-Priority Module::Prioritize() { return PRIORITY_DONTCARE; }
-void Module::OnSetAway(userrec* user) { };
-void Module::OnCancelAway(userrec* user) { };
-
-/* server is a wrapper class that provides methods to all of the C-style
- * exports in the core
- */
+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&) { }
+void Module::OnServerRaw(std::string&, bool, User*) { }
+int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
+void Module::OnMode(User*, void*, int, const std::string&) { }
+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<std::string>&, User *, bool, const std::string&) { return 0; }
+void Module::OnPostCommand(const std::string&, const std::vector<std::string>&, 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*, int, void*, const std::string&) { }
+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*, int, 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*) { }
+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&) { }
+
+ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
+{
+}
+
+ModuleManager::~ModuleManager()
+{
+}
+
+bool ModuleManager::Attach(Implementation i, Module* mod)
+{
+ if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end())
+ return false;
-Server::Server()
+ 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;
}
-Server::~Server()
+void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz)
{
+ for (size_t n = 0; n < sz; ++n)
+ Attach(i[n], mod);
}
-void Server::AddSocket(InspSocket* sock)
+void ModuleManager::DetachAll(Module* mod)
{
- module_sockets.push_back(sock);
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ Detach((Implementation)n, mod);
}
-void Server::RemoveSocket(InspSocket* sock)
+bool ModuleManager::SetPriority(Module* mod, PriorityState s)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
- {
- InspSocket* s = (InspSocket*)*a;
- if (s == sock)
- s->MarkAsClosed();
- }
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ SetPriority(mod, (Implementation)n, s);
+
+ return true;
}
-long Server::PriorityAfter(const std::string &modulename)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ /** 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 (Config->module_names[j] == modulename)
+ if (EventHandlers[i][x] == mod)
{
- return ((j << 8) | PRIORITY_AFTER);
+ source = x;
+ found = true;
+ break;
}
}
- return PRIORITY_DONTCARE;
-}
-long Server::PriorityBefore(const std::string &modulename)
-{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ /* Eh? this module doesnt exist, probably trying to set priority on an event
+ * theyre not attached to.
+ */
+ if (!found)
+ return false;
+
+ switch (s)
{
- if (Config->module_names[j] == modulename)
+ /* Dummy value */
+ case PRIO_DONTCARE:
+ swap = false;
+ break;
+ /* Module wants to be first, sod everything else */
+ case PRIO_FIRST:
+ swap_pos = 0;
+ break;
+ /* Module is submissive and wants to be last... awww. */
+ case PRIO_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 PRIO_AFTER:
{
- return ((j << 8) | PRIORITY_BEFORE);
+ /* 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 PRIO_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;
}
- return PRIORITY_DONTCARE;
-}
-bool Server::PublishFeature(const std::string &FeatureName, Module* Mod)
-{
- if (Features.find(FeatureName) == Features.end())
+ /* Do we need to swap? */
+ if (swap && (swap_pos != source))
{
- Features[FeatureName] = Mod;
- return true;
- }
- return false;
-}
-
-bool Server::UnpublishFeature(const std::string &FeatureName)
-{
- featurelist::iterator iter = Features.find(FeatureName);
-
- if (iter == Features.end())
- return false;
+ /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
+ int incrmnt = 1;
- Features.erase(iter);
- return true;
-}
+ if (source > swap_pos)
+ incrmnt = -1;
-Module* Server::FindFeature(const std::string &FeatureName)
-{
- featurelist::iterator iter = Features.find(FeatureName);
-
- if (iter == Features.end())
- return NULL;
-
- return iter->second;
-}
-
-const std::string& Server::GetModuleName(Module* m)
-{
- static std::string nothing = ""; /* Prevent compiler warning */
- for (int i = 0; i <= MODCOUNT; i++)
- {
- if (modules[i] == m)
+ for (unsigned int j = source; j != swap_pos; j += incrmnt)
{
- return Config->module_names[i];
+ if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+ continue;
+
+ std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
}
}
- return nothing; /* As above */
-}
-
-void Server::RehashServer()
-{
- WriteOpers("*** Rehashing config file");
- Config->Read(false,NULL);
-}
-ServerConfig* Server::GetConfig()
-{
- return Config;
+ return true;
}
-std::string Server::GetVersion()
+std::string& ModuleManager::LastError()
{
- return ServerInstance->GetVersionString();
+ return LastModuleError;
}
-void Server::DelSocket(InspSocket* sock)
+bool ModuleManager::Load(const char* filename)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+ /* 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,'?')))
{
- if (*a == sock)
+ int n_match = 0;
+ DIR* library = opendir(Instance->Config->ModPath);
+ if (library)
{
- module_sockets.erase(a);
- return;
+ /* 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, NULL))
+ {
+ 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);
}
-}
-long Server::GetChannelCount()
-{
- return (long)chanlist.size();
-}
+ char modfile[MAXBUF];
+ snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
+ std::string filename_str = filename;
-/* 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).
- */
-
-chanrec* Server::GetChannelIndex(long index)
-{
- int target = 0;
- for (chan_hash::iterator n = chanlist.begin(); n != chanlist.end(); n++, target++)
+ if (!ServerConfig::DirValid(modfile))
{
- if (index == target)
- return n->second;
+ 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;
}
- return NULL;
-}
-
-void Server::AddTimer(InspTimer* T)
-{
- ::AddTimer(T);
-}
-
-void Server::SendOpers(const std::string &s)
-{
- WriteOpers("%s",s.c_str());
-}
-
-bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
-{
- return match(sliteral.c_str(),spattern.c_str());
-}
-
-void Server::SendToModeMask(const std::string &modes, int flags, const std::string &text)
-{
- WriteMode(modes.c_str(),flags,"%s",text.c_str());
-}
+
+ if (!ServerConfig::FileExists(modfile))
+ {
+ LastModuleError = "Module file could not be found: " + filename_str;
+ Instance->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!";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
+ }
+
+ Module* newmod = NULL;
+ ircd_module* newhandle = NULL;
-chanrec* Server::JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key)
-{
- return add_channel(user,cname.c_str(),key.c_str(),false);
-}
+ 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");
+ newmod = newhandle->CallInit();
-chanrec* Server::PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason)
-{
- return del_channel(user,cname.c_str(),reason.c_str(),false);
-}
+ if (newmod)
+ {
+ Version v = newmod->GetVersion();
-chanuserlist Server::GetUsers(chanrec* chan)
-{
- chanuserlist userl;
- userl.clear();
- CUList *list = chan->GetUsers();
- for (CUList::iterator i = list->begin(); i != list->end(); i++)
- userl.push_back(i->second);
- return userl;
-}
-void Server::ChangeUserNick(userrec* user, const std::string &nickname)
-{
- force_nickchange(user,nickname.c_str());
-}
+ 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) + ")";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
+ }
+ else
+ {
+ 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]"));
+ }
-void Server::KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason)
-{
- if (source)
+ 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";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
+ }
+ }
+ /** XXX: Is there anything we can do about this mess? -- Brain */
+ catch (LoadModuleException& modexcept)
{
- kick_channel(source,target,chan,(char*)reason.c_str());
+ 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;
}
- else
+ catch (FindSymbolException& modexcept)
{
- server_kick_channel(target,chan,(char*)reason.c_str(),true);
+ 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)
+ {
+ 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;
}
-}
-
-void Server::QuitUser(userrec* user, const std::string &reason)
-{
- kill_link(user,reason.c_str());
-}
-bool Server::IsUlined(const std::string &server)
-{
- return is_uline(server.c_str());
-}
+ this->ModCount++;
+ FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
-bool Server::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
-{
- return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
-}
+ /* 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<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+ n->second.second->Prioritize();
-bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
-{
- return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
+ Instance->BuildISupport();
+ return true;
}
-void Server::Log(int level, const std::string &s)
+bool ModuleManager::Unload(const char* filename)
{
- log(level,"%s",s.c_str());
-}
+ std::string filename_str(filename);
+ std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
-void Server::AddCommand(command_t *f)
-{
- if (!ServerInstance->Parser->CreateCommand(f))
+ if (modfind != Modules.end())
{
- ModuleException err("Command "+std::string(f->command)+" already exists.");
- throw (err);
- }
-}
+ if (modfind->second.second->GetVersion().Flags & VF_STATIC)
+ {
+ LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
+ Instance->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 + "'";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
+ }
-void Server::SendMode(const char** parameters, int pcnt, userrec *user)
-{
- ServerInstance->ModeGrok->Process(parameters,pcnt,user,true);
-}
+ /* Give the module a chance to tidy out all its metadata */
+ for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
+ {
+ modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
+ }
+ for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++)
+ {
+ modfind->second.second->OnCleanup(TYPE_USER,u->second);
+ }
-void Server::Send(int Socket, const std::string &s)
-{
- Write_NoFormat(Socket,s.c_str());
-}
+ /* Tidy up any dangling resolvers */
+ Instance->Res->CleanResolvers(modfind->second.second);
-void Server::SendServ(int Socket, const std::string &s)
-{
- WriteServ_NoFormat(Socket,s.c_str());
-}
-void Server::SendFrom(int Socket, userrec* User, const std::string &s)
-{
- WriteFrom_NoFormat(Socket,User,s.c_str());
-}
+ FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
-void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s)
-{
- if (!Source)
- {
- // if source is NULL, then the message originates from the local server
- WriteServ_NoFormat(Dest->fd,s.c_str());
- }
- else
- {
- // otherwise it comes from the user specified
- WriteTo_NoFormat(Source,Dest,s.c_str());
- }
-}
+ this->DetachAll(modfind->second.second);
-void Server::SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text)
-{
- WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str());
-}
+ Instance->Parser->RemoveCommands(filename);
-void Server::SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender)
-{
- if (IncludeSender)
- {
- WriteChannel_NoFormat(Channel,User,s.c_str());
- }
- else
- {
- ChanExceptSender_NoFormat(Channel,User,0,s.c_str());
+ delete modfind->second.second;
+ delete modfind->second.first;
+ Modules.erase(modfind);
+
+ Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
+ this->ModCount--;
+ Instance->BuildISupport();
+ return true;
}
-}
-bool Server::CommonChannels(userrec* u1, userrec* u2)
-{
- return (common_channels(u1,u2) != 0);
+ LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
}
-void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
{
- std::string CompleteLine = LinePrefix;
- std::string Word = "";
- while (TextStream >> Word)
+ char configToken[MAXBUF];
+ ModCount = -1;
+
+ for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
{
- if (CompleteLine.length() + Word.length() + 3 > 500)
+ 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))
{
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
- CompleteLine = LinePrefix;
+ 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);
}
- CompleteLine = CompleteLine + Word + " ";
}
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
}
-void Server::SendCommon(userrec* User, const std::string &text, bool IncludeSender)
+bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
{
- if (IncludeSender)
- {
- WriteCommon_NoFormat(User,text.c_str());
- }
- else
+ if (Features.find(FeatureName) == Features.end())
{
- WriteCommonExcept_NoFormat(User,text.c_str());
+ Features[FeatureName] = Mod;
+ return true;
}
+ return false;
}
-void Server::SendWallops(userrec* User, const std::string &text)
-{
- WriteWallOps(User,false,"%s",text.c_str());
-}
-
-void Server::ChangeHost(userrec* user, const std::string &host)
-{
- ChangeDisplayedHost(user,host.c_str());
-}
-
-void Server::ChangeGECOS(userrec* user, const std::string &gecos)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
{
- ChangeName(user,gecos.c_str());
-}
+ featurelist::iterator iter = Features.find(FeatureName);
+
+ if (iter == Features.end())
+ return false;
-bool Server::IsNick(const std::string &nick)
-{
- return (isnick(nick.c_str()) != 0);
+ Features.erase(iter);
+ return true;
}
-userrec* Server::FindNick(const std::string &nick)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
{
- return Find(nick);
-}
+ featurelist::iterator iter = Features.find(FeatureName);
-userrec* Server::FindDescriptor(int socket)
-{
- return (socket < 65536 ? fd_ref_table[socket] : NULL);
-}
+ if (iter == Features.end())
+ return NULL;
-chanrec* Server::FindChannel(const std::string &channel)
-{
- return FindChan(channel.c_str());
+ return iter->second;
}
-std::string Server::ChanMode(userrec* User, chanrec* Chan)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
- return cmode(User,Chan);
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-std::string Server::GetServerName()
-{
- return Config->ServerName;
+ if (iter == Interfaces.end())
+ {
+ modulelist ml;
+ ml.push_back(Mod);
+ Interfaces[InterfaceName] = std::make_pair(0, ml);
+ }
+ else
+ {
+ iter->second.second.push_back(Mod);
+ }
+ return true;
}
-std::string Server::GetNetworkName()
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
{
- return Config->Network;
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-std::string Server::GetServerDescription()
-{
- return Config->ServerDesc;
-}
+ if (iter == Interfaces.end())
+ return false;
-Admin Server::GetAdmin()
-{
- return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+ {
+ if (*x == Mod)
+ {
+ iter->second.second.erase(x);
+ if (iter->second.second.empty())
+ Interfaces.erase(InterfaceName);
+ return true;
+ }
+ }
+ return false;
}
-
-bool Server::AddMode(ModeHandler* mh, const unsigned char mode)
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
{
- return ServerInstance->ModeGrok->AddMode(mh,mode);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter == Interfaces.end())
+ return NULL;
+ else
+ return &(iter->second.second);
}
-bool Server::AddModeWatcher(ModeWatcher* mw)
+bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName)
{
- return ServerInstance->ModeGrok->AddModeWatcher(mw);
+ 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());
+ }
}
-bool Server::DelModeWatcher(ModeWatcher* mw)
+void ModuleManager::UseInterface(const std::string &InterfaceName)
{
- return ServerInstance->ModeGrok->DelModeWatcher(mw);
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first++;
-bool Server::AddResolver(Resolver* r)
-{
- return ServerInstance->Res->AddResolverClass(r);
}
-int Server::CountUsers(chanrec* c)
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
{
- return usercount(c);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first--;
}
-bool Server::UserToPseudo(userrec* user, const std::string &message)
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
{
- unsigned int old_fd = user->fd;
- Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
- user->FlushWriteBuf();
- user->ClearBuffer();
- user->fd = FD_MAGIC_NUMBER;
-
- if (find(local_users.begin(),local_users.end(),user) != local_users.end())
+ for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
- local_users.erase(find(local_users.begin(),local_users.end(),user));
- log(DEBUG,"Delete local user");
- }
-
- ServerInstance->SE->DelFd(old_fd);
- shutdown(old_fd,2);
- close(old_fd);
- return true;
-}
-
-bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
-{
- log(DEBUG,"PseudoToUser");
- zombie->fd = alive->fd;
- FOREACH_MOD(I_OnUserQuit,OnUserQuit(alive,message));
- alive->fd = FD_MAGIC_NUMBER;
- alive->FlushWriteBuf();
- alive->ClearBuffer();
- // save these for later
- std::string oldnick = alive->nick;
- std::string oldhost = alive->host;
- std::string oldident = alive->ident;
- kill_link(alive,message.c_str());
- if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
- {
- local_users.erase(find(local_users.begin(),local_users.end(),alive));
- log(DEBUG,"Delete local user");
- }
- // Fix by brain - cant write the user until their fd table entry is updated
- fd_ref_table[zombie->fd] = zombie;
- Write(zombie->fd,":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
- for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
- {
- if (((ucrec*)(*i))->channel != NULL)
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
{
- chanrec* Ptr = ((ucrec*)(*i))->channel;
- WriteFrom(zombie->fd,zombie,"JOIN %s",Ptr->name);
- if (Ptr->topicset)
- {
- WriteServ(zombie->fd,"332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
- WriteServ(zombie->fd,"333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
- }
- userlist(zombie,Ptr);
- WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
+ if (*x == m)
+ {
+ return std::make_pair(iter->second.first, iter->first);
+ }
}
}
- if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
- local_users.push_back(zombie);
-
- return true;
+ return std::make_pair(0, "");
}
-void Server::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+const std::string& ModuleManager::GetModuleName(Module* m)
{
- add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_GLINES);
-}
+ static std::string nothing;
-void Server::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
-{
- add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
- apply_lines(APPLY_QLINES);
-}
+ 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;
+ }
-void Server::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
-{
- add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
- apply_lines(APPLY_ZLINES);
+ return nothing;
}
-void Server::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+/* 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)
{
- add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_KLINES);
+ 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;
}
-void Server::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
{
- add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ return this->Parser->CallHandler(commandname, parameters, user);
}
-bool Server::DelGLine(const std::string &hostmask)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
{
- return del_gline(hostmask.c_str());
+ return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-bool Server::DelQLine(const std::string &nickname)
+void InspIRCd::AddCommand(Command *f)
{
- return del_qline(nickname.c_str());
+ if (!this->Parser->CreateCommand(f))
+ {
+ ModuleException err("Command "+std::string(f->command)+" already exists.");
+ throw (err);
+ }
}
-bool Server::DelZLine(const std::string &ipaddr)
+void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
{
- return del_zline(ipaddr.c_str());
+ this->Modes->Process(parameters, user, true);
}
-bool Server::DelKLine(const std::string &hostmask)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
{
- return del_kline(hostmask.c_str());
+ std::string CompleteLine = LinePrefix;
+ std::string Word;
+ while (TextStream >> Word)
+ {
+ if (CompleteLine.length() + Word.length() + 3 > 500)
+ {
+ User->WriteServ(CompleteLine);
+ CompleteLine = LinePrefix;
+ }
+ CompleteLine = CompleteLine + Word + " ";
+ }
+ User->WriteServ(CompleteLine);
}
-bool Server::DelELine(const std::string &hostmask)
+User* FindDescriptorHandler::Call(int socket)
{
- return del_eline(hostmask.c_str());
+ return reinterpret_cast<User*>(Server->SE->GetRef(socket));
}
-long Server::CalcDuration(const std::string &delta)
+bool InspIRCd::AddResolver(Resolver* r, bool cached)
{
- return duration(delta.c_str());
+ if (!cached)
+ return this->Res->AddResolverClass(r);
+ else
+ {
+ r->TriggerCachedResult();
+ delete r;
+ return true;
+ }
}
-/*
- * XXX why on *earth* is this in modules.cpp...? I think
- * perhaps we need a server.cpp for Server:: stuff where possible. -- w00t
- */
-bool Server::IsValidMask(const std::string &mask)
+Module* ModuleManager::Find(const std::string &name)
{
- char* dest = (char*)mask.c_str();
- if (strchr(dest,'!')==0)
- return false;
- if (strchr(dest,'@')==0)
- return false;
- for (char* i = dest; *i; i++)
- if (*i < 32)
- return false;
- for (char* i = dest; *i; i++)
- if (*i > 126)
- return false;
- unsigned int c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '!')
- c++;
- if (c>1)
- return false;
- c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '@')
- c++;
- if (c>1)
- return false;
+ std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(name);
- return true;
+ if (modfind == Modules.end())
+ return NULL;
+ else
+ return modfind->second.second;
}
-Module* Server::FindModule(const std::string &name)
+const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
{
- for (int i = 0; i <= MODCOUNT; i++)
- {
- if (Config->module_names[i] == name)
- {
- return modules[i];
- }
- }
- return NULL;
+ 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))
+ retval.push_back(x->first);
+ return retval;
}
-ConfigReader::ConfigReader()
+ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
{
- // Config->ClearStack();
-
- /* 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->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-
- //~ this->readerror = Config->LoadConf(CONFIG_FILE, this->cache,this->errorlog);
- //~ if (!this->readerror)
- //~ this->error = CONF_FILE_NOT_FOUND;
-
- this->data = &Config->config_data;
+ this->error = CONF_NO_ERROR;
+ this->data = &ServerInstance->Config->config_data;
this->privatehash = false;
}
ConfigReader::~ConfigReader()
{
- //~ if (this->cache)
- //~ delete this->cache;
if (this->errorlog)
- DELETE(this->errorlog);
+ delete this->errorlog;
if(this->privatehash)
- DELETE(this->data);
+ delete this->data;
}
-ConfigReader::ConfigReader(const std::string &filename)
+ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- Config->ClearStack();
-
+ ServerInstance->Config->ClearStack();
+
+ this->error = CONF_NO_ERROR;
this->data = new ConfigDataHash;
this->privatehash = true;
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- this->readerror = 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;
-};
+}
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index)
+
+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 (!Config->ConfValue(*this->data, tag, name, index, result))
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
- return "";
}
-
return result;
}
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
+{
+ return ReadValue(tag, name, "", index, allow_linefeeds);
+}
+
+bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
+{
+ return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index);
+}
+
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
- return Config->ConfValueBool(*this->data, tag, name, index);
+ return ReadFlag(tag, name, "", index);
}
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
{
int result;
- if(!Config->ConfValueInteger(*this->data, tag, name, index, result))
+ if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
}
- if ((needs_unsigned) && (result < 0))
+ if ((need_positive) && (result < 0))
{
- this->error = CONF_NOT_UNSIGNED;
+ this->error = CONF_INT_NEGATIVE;
return 0;
}
return result;
}
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool need_positive)
+{
+ return ReadInteger(tag, name, "", index, need_positive);
+}
+
long ConfigReader::GetError()
{
long olderr = this->error;
return olderr;
}
-void ConfigReader::DumpErrors(bool bail, userrec* user)
+void ConfigReader::DumpErrors(bool bail, User* user)
{
- /* XXX - Duplicated code */
-
- if (bail)
- {
- printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
- Exit(0);
- }
- else
- {
- std::string errors = this->errorlog->str();
- std::string::size_type start;
- unsigned int prefixlen;
-
- start = 0;
- /* ":Config->ServerName NOTICE user->nick :" */
- prefixlen = strlen(Config->ServerName) + strlen(user->nick) + 11;
-
- if (user)
- {
- WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
-
- while(start < errors.length())
- {
- WriteServ(user->fd, "NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
- start += 510 - prefixlen;
- }
- }
- else
- {
- WriteOpers("There were errors in the configuration file:");
-
- while(start < errors.length())
- {
- WriteOpers(errors.substr(start, 360).c_str());
- start += 360;
- }
- }
-
- return;
- }
+ ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
}
int ConfigReader::Enumerate(const std::string &tag)
{
- return Config->ConfValueEnum(*this->data, tag);
+ return ServerInstance->Config->ConfValueEnum(*this->data, tag);
}
int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
- return Config->ConfVarEnum(*this->data, tag, index);
+ return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
}
bool ConfigReader::Verify()
}
-FileReader::FileReader(const std::string &filename)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- file_cache c;
- readfile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ LoadFile(filename);
}
-FileReader::FileReader()
+FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
{
}
std::string FileReader::Contents()
{
- std::string x = "";
+ std::string x;
for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
{
x.append(*a);
void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- readfile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ c.clear();
+ if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+ {
+ this->fc = c;
+ this->CalcSize();
+ }
}
{
return fc.size();
}
-
-
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT = -1;