* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 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.
*
* ---------------------------------------------------
*/
-using namespace std;
+/* $Core: libIRCDmodules */
-#include "inspircd_config.h"
#include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#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 std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern time_t TIME;
-class Server;
-extern userrec* fd_ref_table[65536];
-
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern command_table cmdlist;
-ExtModeList EMode;
-
-// returns true if an extended mode character is in use
-bool ModeDefined(char modechar, int type)
-{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return true;
- }
- }
- return false;
-}
-
-bool ModeIsListMode(char modechar, int type)
-{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
- {
- return true;
- }
- }
- return false;
-}
-
-bool ModeDefinedOper(char modechar, int type)
-{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
- {
- return true;
- }
- }
- return false;
-}
+#ifndef WIN32
+ #include <dirent.h>
+#endif
-// returns number of parameters for a custom mode when it is switched on
-int ModeDefinedOn(char modechar, int type)
+// version is a simple class for holding a modules version number
+Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
+: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return i->params_when_on;
- }
- }
- return 0;
}
-// returns number of parameters for a custom mode when it is switched on
-int ModeDefinedOff(char modechar, int type)
+Request::Request(char* anydata, Module* src, Module* dst)
+: data(anydata), source(src), dest(dst)
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return i->params_when_off;
- }
- }
- return 0;
+ /* Ensure that because this module doesnt support ID strings, it doesnt break modules that do
+ * by passing them uninitialized pointers (could happen)
+ */
+ id = '\0';
}
-// returns true if an extended mode character is in use
-bool DoAddExtendedMode(char modechar, int type, bool requires_oper, int params_on, int params_off)
+Request::Request(Module* src, Module* dst, const char* idstr)
+: id(idstr), source(src), dest(dst)
{
- if (ModeDefined(modechar,type)) {
- return false;
- }
- EMode.push_back(ExtMode(modechar,type,requires_oper,params_on,params_off));
- return true;
}
-// turns a mode into a listmode
-void ModeMakeList(char modechar)
+char* Request::GetData()
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == MT_CHANNEL))
- {
- i->list = true;
- return;
- }
- }
- return;
+ return this->data;
}
-// 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) { };
-
-Request::Request(char* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { };
-
-char* Request::GetData()
+const char* Request::GetId()
{
- return this->data;
+ return this->id;
}
Module* Request::GetSource()
{
- return this->source;
+ return this->source;
}
Module* Request::GetDest()
{
- return this->dest;
+ return this->dest;
}
-char* Request::Send()
+const char* Request::Send()
{
- if (this->dest)
- {
- return dest->OnRequest(this);
- }
- else
- {
- return NULL;
- }
+ if (this->dest)
+ {
+ return dest->OnRequest(this);
+ }
+ else
+ {
+ return NULL;
+ }
}
-Event::Event(char* anydata, Module* src, 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->data;
+ return (char*)this->data;
}
Module* Event::GetSource()
{
- return this->source;
+ return this->source;
}
-char* Event::Send()
+char* Event::Send(InspIRCd* ServerInstance)
{
- FOREACH_MOD(I_OnEvent,OnEvent(this));
- return NULL;
+ FOREACH_MOD(I_OnEvent,OnEvent(this));
+ return NULL;
}
std::string Event::GetEventID()
{
- return this->id;
+ return this->id;
}
// These declarations define the behavours of the base class Module (which does nothing at all)
- Module::Module(Server* Me) { }
+ Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
Module::~Module() { }
-void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, std::string message) { }
-void Module::OnUserDisconnect(userrec* user) { }
-void Module::OnUserJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel) { }
-void Module::OnRehash(std::string parameter) { }
-void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; }
-void Module::OnMode(userrec* user, void* dest, int target_type, std::string text) { };
-Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void Module::OnOper(userrec* user, 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) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text) { return 0; };
-int Module::OnUserPreNick(userrec* user, std::string newnick) { return 0; };
-void Module::OnUserPostNick(userrec* user, 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, std::string reason) { return 0; };
-void Module::OnLoadModule(Module* mod,std::string name) { };
-void Module::OnUnloadModule(Module* mod,std::string name) { };
-void Module::OnBackgroundTimer(time_t curtime) { };
-void Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
-int Module::OnPreCommand(std::string command, 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, std::string reason) { return 0; };
-void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason) { };
-int Module::OnRawMode(userrec* user, chanrec* chan, char mode, std::string param, bool adding, int pcnt) { return 0; };
-int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckKey(userrec* user, chanrec* chan, std::string keygiven) { return 0; };
-int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
-void Module::OnStats(char symbol) { };
-int Module::OnChangeLocalUserHost(userrec* user, std::string newhost) { return 0; };
-int Module::OnChangeLocalUserGECOS(userrec* user, std::string newhost) { return 0; };
-int Module::OnLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { return 0; };
-void Module::OnEvent(Event* event) { return; };
-char* Module::OnRequest(Request* request) { return NULL; };
-int Module::OnOperCompare(std::string password, std::string input) { return 0; };
-void Module::OnGlobalOper(userrec* user) { };
-void Module::OnGlobalConnect(userrec* user) { };
-int Module::OnAddBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
-int Module::OnDelBan(userrec* source, chanrec* channel,std::string banmask) { return 0; };
-void Module::OnRawSocketAccept(int fd, 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, std::string text) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, std::string text) { };
-void Module::OnRemoteKill(userrec* source, userrec* dest, std::string reason) { };
-void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
-void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, std::string topic) { };
-void Module::OnGetServerDescription(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, std::string modeline) { };
-void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, std::string extname) { };
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, std::string extname) { };
-void Module::OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) { };
-void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, std::string extname, std::string extdata) { };
-void Module::OnWallops(userrec* user, std::string text) { };
-void Module::OnChangeHost(userrec* user, std::string newhost) { };
-void Module::OnChangeName(userrec* user, std::string gecos) { };
-void Module::OnAddGLine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnAddZLine(long duration, userrec* source, std::string reason, std::string ipmask) { };
-void Module::OnAddKLine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnAddQLine(long duration, userrec* source, std::string reason, std::string nickmask) { };
-void Module::OnAddELine(long duration, userrec* source, std::string reason, std::string hostmask) { };
-void Module::OnDelGLine(userrec* source, std::string hostmask) { };
-void Module::OnDelZLine(userrec* source, std::string ipmask) { };
-void Module::OnDelKLine(userrec* source, std::string hostmask) { };
-void Module::OnDelQLine(userrec* source, std::string nickmask) { };
-void Module::OnDelELine(userrec* source, 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; };
-
-/* server is a wrapper class that provides methods to all of the C-style
- * exports in the core
- */
+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*, const 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(1,0,0,0,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(const std::string&, const 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::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;
}
-Server::~Server()
+bool ModuleManager::Detach(Implementation i, Module* mod)
{
-}
+ EventHandlerIter x = std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod);
-void Server::AddSocket(InspSocket* sock)
-{
- module_sockets.push_back(sock);
+ if (x == EventHandlers[i].end())
+ return false;
+
+ EventHandlers[i].erase(x);
+ return true;
}
-void Server::RehashServer()
+void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz)
{
- WriteOpers("*** Rehashing config file");
- Config->Read(false,NULL);
+ for (size_t n = 0; n < sz; ++n)
+ Attach(i[n], mod);
}
-ServerConfig* Server::GetConfig()
+void ModuleManager::DetachAll(Module* mod)
{
- return Config;
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ Detach((Implementation)n, mod);
}
-std::string Server::GetVersion()
+bool ModuleManager::SetPriority(Module* mod, PriorityState s)
{
- return ServerInstance->GetVersionString();
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ SetPriority(mod, (Implementation)n, s);
+
+ return true;
}
-void Server::DelSocket(InspSocket* sock)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+ /** 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 (*a == sock)
+ if (EventHandlers[i][x] == mod)
{
- module_sockets.erase(a);
- return;
+ source = x;
+ found = true;
+ break;
}
}
-}
-void Server::SendOpers(std::string s)
-{
- WriteOpers("%s",s.c_str());
-}
+ /* Eh? this module doesnt exist, probably trying to set priority on an event
+ * theyre not attached to.
+ */
+ if (!found)
+ return false;
-bool Server::MatchText(std::string sliteral, std::string spattern)
-{
- char literal[MAXBUF],pattern[MAXBUF];
- strlcpy(literal,sliteral.c_str(),MAXBUF);
- strlcpy(pattern,spattern.c_str(),MAXBUF);
- return match(literal,pattern);
-}
+ switch (s)
+ {
+ /* 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:
+ {
+ /* 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;
+ }
-void Server::SendToModeMask(std::string modes, int flags, std::string text)
-{
- WriteMode(modes.c_str(),flags,"%s",text.c_str());
-}
+ /* Do we need to swap? */
+ if (swap && (swap_pos != source))
+ std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]);
-chanrec* Server::JoinUserToChannel(userrec* user, std::string cname, std::string key)
-{
- return add_channel(user,cname.c_str(),key.c_str(),false);
+ return true;
}
-chanrec* Server::PartUserFromChannel(userrec* user, std::string cname, std::string reason)
+std::string& ModuleManager::LastError()
{
- return del_channel(user,cname.c_str(),reason.c_str(),false);
+ return LastModuleError;
}
-chanuserlist Server::GetUsers(chanrec* chan)
+bool ModuleManager::Load(const char* filename)
{
- chanuserlist userl;
- userl.clear();
- std::vector<char*> *list = chan->GetUsers();
- for (std::vector<char*>::iterator i = list->begin(); i != list->end(); i++)
+ /* 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,'?')))
{
- char* o = *i;
- userl.push_back((userrec*)o);
+ int n_match = 0;
+ DIR* library = opendir(Instance->Config->ModPath);
+ if (library)
+ {
+ /* Try and locate and load all modules matching the pattern */
+ dirent* entry = NULL;
+ while (0 != (entry = readdir(library)))
+ {
+ if (Instance->MatchText(entry->d_name, filename))
+ {
+ 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);
}
- return userl;
-}
-void Server::ChangeUserNick(userrec* user, std::string nickname)
-{
- force_nickchange(user,nickname.c_str());
-}
-void Server::QuitUser(userrec* user, std::string reason)
-{
- kill_link(user,reason.c_str());
-}
+ char modfile[MAXBUF];
+ snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
+ std::string filename_str = filename;
-bool Server::IsUlined(std::string server)
-{
- return is_uline(server.c_str());
-}
+ if (!ServerConfig::DirValid(modfile))
+ {
+ 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;
+ }
+
+ 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;
-void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
-{
- ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
-}
+ 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();
-bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user)
-{
- return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
-}
+ if (newmod)
+ {
+ Version v = newmod->GetVersion();
+
+ 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 %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+ }
+
+ 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)
+ {
+ 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;
+ }
+ catch (FindSymbolException& modexcept)
+ {
+ 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::Log(int level, std::string s)
-{
- log(level,"%s",s.c_str());
-}
+ this->ModCount++;
+ FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
-void Server::AddCommand(command_t *f)
-{
- ServerInstance->Parser->CreateCommand(f);
-}
+ /* 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();
-void Server::SendMode(char **parameters, int pcnt, userrec *user)
-{
- ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user);
+ Instance->BuildISupport();
+ return true;
}
-void Server::Send(int Socket, std::string s)
+bool ModuleManager::Unload(const char* filename)
{
- Write_NoFormat(Socket,s.c_str());
-}
+ std::string filename_str(filename);
+ std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
-void Server::SendServ(int Socket, std::string s)
-{
- WriteServ_NoFormat(Socket,s.c_str());
-}
+ if (modfind != Modules.end())
+ {
+ 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::SendFrom(int Socket, userrec* User, std::string s)
-{
- WriteFrom_NoFormat(Socket,User,s.c_str());
-}
+ /* 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::SendTo(userrec* Source, userrec* Dest, std::string s)
-{
- if (!Source)
- {
- // if source is NULL, then the message originates from the local server
- Write(Dest->fd,":%s %s",this->GetServerName().c_str(),s.c_str());
- }
- else
- {
- // otherwise it comes from the user specified
- WriteTo_NoFormat(Source,Dest,s.c_str());
+ /* Tidy up any dangling resolvers */
+ Instance->Res->CleanResolvers(modfind->second.second);
+
+
+ FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
+
+ this->DetachAll(modfind->second.second);
+
+ Instance->Parser->RemoveCommands(filename);
+
+ 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;
}
-}
-void Server::SendChannelServerNotice(std::string ServName, chanrec* Channel, std::string text)
-{
- WriteChannelWithServ((char*)ServName.c_str(), Channel, "%s", text.c_str());
+ LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
}
-void Server::SendChannel(userrec* User, chanrec* Channel, std::string s,bool IncludeSender)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
{
- if (IncludeSender)
- {
- WriteChannel_NoFormat(Channel,User,s.c_str());
- }
- else
+ char configToken[MAXBUF];
+ ModCount = -1;
+
+ for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
{
- ChanExceptSender_NoFormat(Channel,User,s.c_str());
+ 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))
+ {
+ 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);
+ }
}
}
-bool Server::CommonChannels(userrec* u1, userrec* u2)
+bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
{
- return (common_channels(u1,u2) != 0);
-}
-
-void Server::SendCommon(userrec* User, std::string text,bool IncludeSender)
-{
- 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, std::string text)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
{
- WriteWallOps(User,false,"%s",text.c_str());
-}
+ featurelist::iterator iter = Features.find(FeatureName);
+
+ if (iter == Features.end())
+ return false;
-void Server::ChangeHost(userrec* user, std::string host)
-{
- ChangeDisplayedHost(user,host.c_str());
+ Features.erase(iter);
+ return true;
}
-void Server::ChangeGECOS(userrec* user, std::string gecos)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
{
- ChangeName(user,gecos.c_str());
-}
+ featurelist::iterator iter = Features.find(FeatureName);
-bool Server::IsNick(std::string nick)
-{
- return (isnick(nick.c_str()) != 0);
-}
+ if (iter == Features.end())
+ return NULL;
-userrec* Server::FindNick(std::string nick)
-{
- return Find(nick);
+ return iter->second;
}
-userrec* Server::FindDescriptor(int socket)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
- return (socket < 65536 ? fd_ref_table[socket] : NULL);
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-chanrec* Server::FindChannel(std::string channel)
-{
- return FindChan(channel.c_str());
+ 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::ChanMode(userrec* User, chanrec* Chan)
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
{
- return cmode(User,Chan);
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-bool Server::IsOnChannel(userrec* User, chanrec* Chan)
-{
- return has_channel(User,Chan);
+ if (iter == Interfaces.end())
+ return false;
+
+ 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;
}
-std::string Server::GetServerName()
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
{
- return Config->ServerName;
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter == Interfaces.end())
+ return NULL;
+ else
+ return &(iter->second.second);
}
-std::string Server::GetNetworkName()
+bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName)
{
- return Config->Network;
+ 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());
+ }
}
-std::string Server::GetServerDescription()
+void ModuleManager::UseInterface(const std::string &InterfaceName)
{
- return Config->ServerDesc;
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first++;
+
}
-Admin Server::GetAdmin()
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
{
- return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first--;
}
-
-
-bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
{
- if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
+ for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
- if (type == MT_SERVER)
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
{
- log(DEBUG,"*** API ERROR *** Modes of type MT_SERVER are reserved for future expansion");
- return false;
+ if (*x == m)
+ {
+ return std::make_pair(iter->second.first, iter->first);
+ }
}
- if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
- {
- log(DEBUG,"*** API ERROR *** Parameters on MT_CLIENT modes are not supported");
- return false;
- }
- if ((params_when_on>1) || (params_when_off>1))
- {
- log(DEBUG,"*** API ERROR *** More than one parameter for an MT_CHANNEL mode is not yet supported");
- return false;
- }
- return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
}
- else
- {
- log(DEBUG,"*** API ERROR *** Muppet modechar detected.");
- }
- return false;
+ return std::make_pair(0, "");
}
-bool Server::AddExtendedListMode(char modechar)
+const std::string& ModuleManager::GetModuleName(Module* m)
{
- bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1);
- if (res)
- ModeMakeList(modechar);
- return res;
-}
-
-int Server::CountUsers(chanrec* c)
-{
- return usercount(c);
-}
-
-
-bool Server::UserToPseudo(userrec* user,std::string message)
-{
- unsigned int old_fd = user->fd;
- user->fd = FD_MAGIC_NUMBER;
- user->ClearBuffer();
- Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
- ServerInstance->SE->DelFd(old_fd);
- shutdown(old_fd,2);
- close(old_fd);
- return true;
-}
+ static std::string nothing;
-bool Server::PseudoToUser(userrec* alive,userrec* zombie,std::string message)
-{
- zombie->fd = alive->fd;
- alive->fd = FD_MAGIC_NUMBER;
- alive->ClearBuffer();
- Write(zombie->fd,":%s!%s@%s NICK %s",alive->nick,alive->ident,alive->host,zombie->nick);
- kill_link(alive,message.c_str());
- fd_ref_table[zombie->fd] = zombie;
- for (unsigned int i = 0; i < zombie->chans.size(); i++)
- {
- if (zombie->chans[i].channel != NULL)
- {
- if (zombie->chans[i].channel->name)
- {
- chanrec* Ptr = zombie->chans[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);
-
- }
- }
- }
- return true;
-}
+ 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::AddGLine(long duration, std::string source, std::string reason, std::string hostmask)
-{
- add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ return nothing;
}
-void Server::AddQLine(long duration, std::string source, std::string reason, std::string nickname)
-{
- add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
-}
+/* 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).
+ */
-void Server::AddZLine(long duration, std::string source, std::string reason, std::string ipaddr)
+Channel* InspIRCd::GetChannelIndex(long index)
{
- add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
+ 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::AddKLine(long duration, std::string source, std::string reason, std::string hostmask)
+bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
{
- add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ return match(sliteral, spattern);
}
-void Server::AddELine(long duration, std::string source, std::string reason, 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(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(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(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(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(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(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;
+ }
}
-bool Server::IsValidMask(std::string mask)
+Module* ModuleManager::Find(const std::string &name)
{
- const char* dest = mask.c_str();
- if (strchr(dest,'!')==0)
- return false;
- if (strchr(dest,'@')==0)
- return false;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] < 32)
- return false;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] > 126)
- return false;
- unsigned int c = 0;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[i] == '!')
- c++;
- if (c>1)
- return false;
- c = 0;
- for (unsigned int i = 0; i < strlen(dest); i++)
- if (dest[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(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();
- this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->errorlog = new std::stringstream(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->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
+ 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;
+ if(this->privatehash)
+ delete this->data;
}
-ConfigReader::ConfigReader(std::string filename)
+ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- Config->ClearStack();
- this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->readerror = Config->LoadConf(filename.c_str(),this->cache,this->errorlog);
+ 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);
+ /*** 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(std::string tag, 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)
{
- char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
- if (!res)
+ /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
+ std::string result;
+
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
- return "";
}
- return val;
+ return result;
}
-bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
{
- char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
- if (!res)
- {
- this->error = CONF_VALUE_NOT_FOUND;
- return false;
- }
- std::string s = val;
- return ((s == "yes") || (s == "YES") || (s == "true") || (s == "TRUE") || (s == "1"));
+ return ReadValue(tag, name, "", index, allow_linefeeds);
}
-long ConfigReader::ReadInteger(std::string tag, std::string name, int index, bool needs_unsigned)
+bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
{
- char val[MAXBUF];
- char t[MAXBUF];
- char n[MAXBUF];
- strlcpy(t,tag.c_str(),MAXBUF);
- strlcpy(n,name.c_str(),MAXBUF);
- int res = Config->ReadConf(cache,t,n,index,val);
- if (!res)
+ 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 ReadFlag(tag, name, "", 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(*this->data, tag, name, default_value, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
}
- for (unsigned int i = 0; i < strlen(val); i++)
- {
- if (!isdigit(val[i]))
- {
- this->error = CONF_NOT_A_NUMBER;
- return 0;
- }
- }
- if ((needs_unsigned) && (atoi(val)<0))
+
+ if ((need_positive) && (result < 0))
{
- this->error = CONF_NOT_UNSIGNED;
+ this->error = CONF_INT_NEGATIVE;
return 0;
}
- return atoi(val);
+
+ 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()
return olderr;
}
-void ConfigReader::DumpErrors(bool bail, userrec* user)
+void ConfigReader::DumpErrors(bool bail, User* user)
{
- if (bail)
- {
- printf("There were errors in your configuration:\n%s",errorlog->str().c_str());
- exit(0);
- }
- else
- {
- char dataline[1024];
- if (user)
- {
- WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
- while (!errorlog->eof())
- {
- errorlog->getline(dataline,1024);
- WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
- }
- }
- else
- {
- WriteOpers("There were errors in the configuration file:",user->nick);
- while (!errorlog->eof())
- {
- errorlog->getline(dataline,1024);
- WriteOpers(dataline);
- }
- }
- return;
- }
+ ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
}
-int ConfigReader::Enumerate(std::string tag)
+int ConfigReader::Enumerate(const std::string &tag)
{
- return Config->EnumConf(cache,tag.c_str());
+ return ServerInstance->Config->ConfValueEnum(*this->data, tag);
}
-int ConfigReader::EnumerateValues(std::string tag, int index)
+int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
- return Config->EnumValues(cache, tag.c_str(), index);
+ return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
}
bool ConfigReader::Verify()
}
-FileReader::FileReader(std::string filename)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- file_cache c;
- readfile(c,filename.c_str());
- this->fc = c;
+ LoadFile(filename);
}
-FileReader::FileReader()
+FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
{
}
-void FileReader::LoadFile(std::string filename)
+std::string FileReader::Contents()
+{
+ std::string x;
+ for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
+ {
+ x.append(*a);
+ x.append("\r\n");
+ }
+ return x;
+}
+
+unsigned long FileReader::ContentSize()
+{
+ return this->contentsize;
+}
+
+void FileReader::CalcSize()
+{
+ unsigned long n = 0;
+ for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
+ n += (a->length() + 2);
+ this->contentsize = n;
+}
+
+void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- readfile(c,filename.c_str());
- this->fc = c;
+ c.clear();
+ if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+ {
+ this->fc = c;
+ this->CalcSize();
+ }
}
bool FileReader::Exists()
{
- if (fc.size() == 0)
- {
- return(false);
- }
- else
- {
- return(true);
- }
+ return (!(fc.size() == 0));
}
std::string FileReader::GetLine(int x)
{
return fc.size();
}
-
-
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT = -1;
-
-
projects / user / henk / code / inspircd.git / blobdiff