* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
+/* $Core */
+
#include "inspircd.h"
-#include "wildcard.h"
#include "xline.h"
#include "socket.h"
#include "socketengine.h"
#include "command_parse.h"
#include "dns.h"
-
+#include "exitcodes.h"
#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, int api_ver)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
+Version::Version(const std::string &sversion, int flags, int api_ver)
+: version(sversion), Flags(flags), API(api_ver)
{
}
return this->dest;
}
-char* Request::Send()
+const char* Request::Send()
{
if (this->dest)
{
// These declarations define the behavours of the base class Module (which does nothing at all)
- Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
- Module::~Module() { }
-void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { }
-void Module::OnUserDisconnect(userrec* user) { }
-void Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { }
-void Module::OnPostJoin(userrec* user, chanrec* channel) { }
-void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { }
-void Module::OnRehash(userrec* user, const std::string ¶meter) { }
-void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { 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,-1); }
-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, CUList &exempt_list) { return 0; }
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { 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, const std::string &original_line) { return 0; }
-void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { }
-bool Module::OnCheckReady(userrec* user) { return true; }
-int Module::OnUserRegister(userrec* user) { return 0; }
-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, bool &silent) { }
-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, int tagnumber) { return 0; }
-void Module::OnGlobalOper(userrec* user) { }
-void Module::OnPostConnect(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, const char* buffer, int count) { return 0; }
-void Module::OnRawSocketClose(int fd) { }
-void Module::OnRawSocketConnect(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, const CUList &exempt_list) { }
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { }
-void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason) { }
-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, bool displayable) { }
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { }
-void Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { }
-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) { }
-int Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; }
-int Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; }
-void Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { }
+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&) { }
+int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
+void Module::OnMode(User*, void*, int, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
+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*, TargetTypeFlags, void*, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
+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*, TargetTypeFlags, 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(userrec* user) { }
-
+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&) { }
+bool Module::OnHostCycle(User* user) { return false; }
-char* InspIRCd::ModuleError()
+ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
{
- return MODERR;
}
-void InspIRCd::EraseFactory(int j)
+ModuleManager::~ModuleManager()
{
- int v = 0;
- for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
- {
- if (v == j)
- {
- delete *t;
- factory.erase(t);
- factory.push_back(NULL);
- return;
- }
- v++;
- }
}
-void InspIRCd::EraseModule(int j)
+bool ModuleManager::Attach(Implementation i, Module* mod)
{
- int v1 = 0;
- for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++)
- {
- if (v1 == j)
- {
- delete *m;
- modules.erase(m);
- modules.push_back(NULL);
- break;
- }
- v1++;
- }
- int v2 = 0;
- for (std::vector<std::string>::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++)
- {
- if (v2 == j)
- {
- Config->module_names.erase(v);
- break;
- }
- v2++;
- }
+ if (std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod) != EventHandlers[i].end())
+ return false;
+ EventHandlers[i].push_back(mod);
+ return true;
}
-void InspIRCd::MoveTo(std::string modulename,int slot)
+bool ModuleManager::Detach(Implementation i, Module* mod)
{
- unsigned int v2 = 256;
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
- {
- if (Config->module_names[v] == modulename)
- {
- // found an instance, swap it with the item at the end
- v2 = v;
- break;
- }
- }
- if ((v2 != (unsigned int)slot) && (v2 < 256))
- {
- // Swap the module names over
- Config->module_names[v2] = Config->module_names[slot];
- Config->module_names[slot] = modulename;
- // now swap the module factories
- ircd_module* temp = factory[v2];
- factory[v2] = factory[slot];
- factory[slot] = temp;
- // now swap the module objects
- Module* temp_module = modules[v2];
- modules[v2] = modules[slot];
- modules[slot] = temp_module;
- // now swap the implement lists (we dont
- // need to swap the global or recount it)
- for (int n = 0; n < 255; n++)
- {
- char x = Config->implement_lists[v2][n];
- Config->implement_lists[v2][n] = Config->implement_lists[slot][n];
- Config->implement_lists[slot][n] = x;
- }
- }
-}
+ EventHandlerIter x = std::find(EventHandlers[i].begin(), EventHandlers[i].end(), mod);
-void InspIRCd::MoveAfter(std::string modulename, std::string after)
-{
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
- {
- if (Config->module_names[v] == after)
- {
- MoveTo(modulename, v);
- return;
- }
- }
+ if (x == EventHandlers[i].end())
+ return false;
+
+ EventHandlers[i].erase(x);
+ return true;
}
-void InspIRCd::MoveBefore(std::string modulename, std::string before)
+void ModuleManager::Attach(Implementation* i, Module* mod, size_t sz)
{
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
- {
- if (Config->module_names[v] == before)
- {
- if (v > 0)
- {
- MoveTo(modulename, v-1);
- }
- else
- {
- MoveTo(modulename, v);
- }
- return;
- }
- }
+ for (size_t n = 0; n < sz; ++n)
+ Attach(i[n], mod);
}
-void InspIRCd::MoveToFirst(std::string modulename)
+void ModuleManager::DetachAll(Module* mod)
{
- MoveTo(modulename,0);
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ Detach((Implementation)n, mod);
}
-void InspIRCd::MoveToLast(std::string modulename)
+bool ModuleManager::SetPriority(Module* mod, Priority s)
{
- MoveTo(modulename,this->GetModuleCount());
+ for (size_t n = I_BEGIN + 1; n != I_END; ++n)
+ SetPriority(mod, (Implementation)n, s);
+
+ return true;
}
-bool InspIRCd::UnloadModule(const char* filename)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
{
- std::string filename_str = filename;
- 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] == filename_str)
+ if (EventHandlers[i][x] == mod)
{
- if (modules[j]->GetVersion().Flags & VF_STATIC)
- {
- this->Log(DEFAULT,"Failed to unload STATIC module %s",filename);
- snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
- return false;
- }
- std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modules[j]);
- if (intercount.first > 0)
- {
- this->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str());
- snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!",
- intercount.first,
- intercount.first > 1 ? "s" : "",
- intercount.first > 1 ? "are" : "is",
- intercount.second.c_str());
- return false;
- }
- /* Give the module a chance to tidy out all its metadata */
- for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++)
- {
- modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
- }
- for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
- {
- modules[j]->OnCleanup(TYPE_USER,u->second);
- }
-
- /* Tidy up any dangling resolvers */
- this->Res->CleanResolvers(modules[j]);
+ source = x;
+ found = true;
+ break;
+ }
+ }
- FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
+ /* Eh? this module doesnt exist, probably trying to set priority on an event
+ * theyre not attached to.
+ */
+ if (!found)
+ return false;
- for(int t = 0; t < 255; t++)
+ switch (s)
+ {
+ /* Dummy value */
+ case PRIORITY_DONTCARE:
+ swap = false;
+ break;
+ /* Module wants to be first, sod everything else */
+ case PRIORITY_FIRST:
+ swap_pos = 0;
+ break;
+ /* Module is submissive and wants to be last... awww. */
+ case PRIORITY_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 PRIORITY_AFTER:
+ {
+ /* Find the latest possible position */
+ swap_pos = 0;
+ swap = false;
+ for (size_t x = 0; x != EventHandlers[i].size(); ++x)
{
- Config->global_implementation[t] -= Config->implement_lists[j][t];
+ 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;
+ }
+ }
}
-
- /* We have to renumber implement_lists after unload because the module numbers change!
- */
- for(int j2 = j; j2 < 254; j2++)
+ }
+ break;
+ /* Place this module before a set of other modules */
+ case PRIORITY_BEFORE:
+ {
+ swap_pos = EventHandlers[i].size() - 1;
+ swap = false;
+ for (size_t x = 0; x != EventHandlers[i].size(); ++x)
{
- for(int t = 0; t < 255; t++)
+ for (size_t n = 0; n < sz; ++n)
{
- Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t];
+ if ((modules[n]) && (EventHandlers[i][x] == modules[n]) && (x <= swap_pos) && (source >= swap_pos))
+ {
+ swap = true;
+ swap_pos = x;
+ }
}
}
+ }
+ break;
+ }
- // found the module
- Parser->RemoveCommands(filename);
- this->EraseModule(j);
- this->EraseFactory(j);
- this->Log(DEFAULT,"Module %s unloaded",filename);
- this->ModCount--;
- BuildISupport();
- return true;
+ /* Do we need to swap? */
+ if (swap && (swap_pos != source))
+ {
+ /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
+ int incrmnt = 1;
+
+ if (source > swap_pos)
+ incrmnt = -1;
+
+ for (unsigned int j = source; j != swap_pos; j += incrmnt)
+ {
+ if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0))
+ continue;
+
+ std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]);
}
}
- this->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
- snprintf(MODERR,MAXBUF,"Module not loaded");
- return false;
+
+ return true;
}
-bool InspIRCd::LoadModule(const char* filename)
+std::string& ModuleManager::LastError()
+{
+ return LastModuleError;
+}
+
+bool ModuleManager::Load(const char* filename)
{
/* Do we have a glob pattern in the filename?
* The user wants to load multiple modules which
if (strchr(filename,'*') || (strchr(filename,'?')))
{
int n_match = 0;
- DIR* library = opendir(Config->ModPath);
+ DIR* library = opendir(Instance->Config->ModPath);
if (library)
{
/* Try and locate and load all modules matching the pattern */
dirent* entry = NULL;
- while ((entry = readdir(library)))
+ while (0 != (entry = readdir(library)))
{
- if (this->MatchText(entry->d_name, filename))
+ if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
{
- if (!this->LoadModule(entry->d_name))
+ if (!this->Load(entry->d_name))
n_match++;
}
}
* 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 (n_match > 0 ? false : true);
}
char modfile[MAXBUF];
- snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
+ snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
std::string filename_str = filename;
if (!ServerConfig::DirValid(modfile))
{
- snprintf(MODERR, MAXBUF,"Module %s is not within the modules directory.", modfile);
- this->Log(DEFAULT, MODERR);
+ 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))
+
+ if (!ServerConfig::FileExists(modfile))
{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
- {
- if (Config->module_names[j] == filename_str)
- {
- this->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
- snprintf(MODERR, MAXBUF, "Module already loaded");
- return false;
- }
- }
-
- Module* m = NULL;
- ircd_module* a = NULL;
-
- try
- {
- /* This will throw a CoreException if there's a problem loading
- * the module file or getting a pointer to the init_module symbol.
- */
- a = new ircd_module(this, modfile, "init_module");
-
- factory[this->ModCount+1] = a;
-
- m = factory[this->ModCount+1]->CallInit();
-
- if(m)
- {
- Version v = m->GetVersion();
+ LastModuleError = "Module file could not be found: " + filename_str;
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
+ }
- if (v.API != API_VERSION)
- {
- delete m;
- this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
- snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
- return false;
- }
- else
- {
- this->Log(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]"));
- }
+ 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;
+ }
- modules[this->ModCount+1] = m;
-
- /* save the module and the module's classfactory, if
- * this isnt done, random crashes can occur :/ */
- Config->module_names.push_back(filename);
+ Module* newmod = NULL;
+ ircd_module* newhandle = NULL;
- char* x = &Config->implement_lists[this->ModCount+1][0];
- for(int t = 0; t < 255; t++)
- x[t] = 0;
+ 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();
- modules[this->ModCount+1]->Implements(x);
+ if (newmod)
+ {
+ Version v = newmod->GetVersion();
- for(int t = 0; t < 255; t++)
- Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t];
+ 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
{
- this->Log(DEFAULT, "Unable to load %s",modfile);
- snprintf(MODERR,MAXBUF, "Probably missing init_module() entrypoint, but dlsym() didn't notice a problem");
- return false;
+ 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]"));
}
+
+ Modules[filename_str] = std::make_pair(newhandle, newmod);
}
- catch (LoadModuleException& modexcept)
- {
- this->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
- snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
- return false;
- }
- catch (FindSymbolException& modexcept)
- {
- this->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
- snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
- return false;
- }
- catch (CoreException& modexcept)
+ else
{
- this->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason());
- snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ 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;
}
}
- else
+ /** XXX: Is there anything we can do about this mess? -- Brain */
+ catch (LoadModuleException& modexcept)
{
- this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
- snprintf(MODERR,MAXBUF,"Module file could not be found");
+ 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;
}
-
- this->ModCount++;
- FOREACH_MOD_I(this,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
- // now work out which modules, if any, want to move to the back of the queue,
- // and if they do, move them there.
- std::vector<std::string> put_to_back;
- std::vector<std::string> put_to_front;
- std::map<std::string,std::string> put_before;
- std::map<std::string,std::string> put_after;
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ 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)
{
- if (modules[j]->Prioritize() == PRIORITY_LAST)
- put_to_back.push_back(Config->module_names[j]);
- else if (modules[j]->Prioritize() == PRIORITY_FIRST)
- put_to_front.push_back(Config->module_names[j]);
- else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
- put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
- else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
- put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
+ 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;
}
- for (unsigned int j = 0; j < put_to_back.size(); j++)
- MoveToLast(put_to_back[j]);
- for (unsigned int j = 0; j < put_to_front.size(); j++)
- MoveToFirst(put_to_front[j]);
- for (std::map<std::string,std::string>::iterator j = put_before.begin(); j != put_before.end(); j++)
- MoveBefore(j->first,j->second);
- for (std::map<std::string,std::string>::iterator j = put_after.begin(); j != put_after.end(); j++)
- MoveAfter(j->first,j->second);
- BuildISupport();
+
+ this->ModCount++;
+ FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
+
+ /* We give every module a chance to re-prioritize when we introduce a new one,
+ * not just the one thats loading, as the new module could affect the preference
+ * of others
+ */
+ for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+ n->second.second->Prioritize();
+
+ Instance->BuildISupport();
return true;
}
-long InspIRCd::PriorityAfter(const std::string &modulename)
+bool ModuleManager::Unload(const char* filename)
{
- for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+ std::string filename_str(filename);
+ std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
+
+ if (modfind != Modules.end())
{
- if (this->Config->module_names[j] == modulename)
+ 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;
+ }
+
+ /* 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++)
{
- return ((j << 8) | PRIORITY_AFTER);
+ modfind->second.second->OnCleanup(TYPE_USER,u->second);
}
+
+ /* 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;
}
- return PRIORITY_DONTCARE;
+
+ LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
+ Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+ return false;
}
-long InspIRCd::PriorityBefore(const std::string &modulename)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
{
- for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+ char configToken[MAXBUF];
+ ModCount = -1;
+
+ for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
{
- if (this->Config->module_names[j] == modulename)
+ 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))
{
- return ((j << 8) | PRIORITY_BEFORE);
+ 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);
}
}
- return PRIORITY_DONTCARE;
}
-bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
+bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
{
if (Features.find(FeatureName) == Features.end())
{
return false;
}
-bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
-
+
if (iter == Features.end())
return false;
return true;
}
-Module* InspIRCd::FindFeature(const std::string &FeatureName)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
return iter->second;
}
-bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
interfacelist::iterator iter = Interfaces.find(InterfaceName);
modulelist ml;
ml.push_back(Mod);
Interfaces[InterfaceName] = std::make_pair(0, ml);
- return true;
}
else
{
iter->second.second.push_back(Mod);
- return true;
}
- return false;
+ return true;
}
-bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
{
interfacelist::iterator iter = Interfaces.find(InterfaceName);
return false;
}
-modulelist* InspIRCd::FindInterface(const std::string &InterfaceName)
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
{
interfacelist::iterator iter = Interfaces.find(InterfaceName);
if (iter == Interfaces.end())
return &(iter->second.second);
}
-void InspIRCd::UseInterface(const std::string &InterfaceName)
+bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName)
+{
+ 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());
+ }
+}
+
+void ModuleManager::UseInterface(const std::string &InterfaceName)
{
interfacelist::iterator iter = Interfaces.find(InterfaceName);
if (iter != Interfaces.end())
}
-void InspIRCd::DoneWithInterface(const std::string &InterfaceName)
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
{
interfacelist::iterator iter = Interfaces.find(InterfaceName);
if (iter != Interfaces.end())
iter->second.first--;
}
-std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
{
for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
return std::make_pair(0, "");
}
-const std::string& InspIRCd::GetModuleName(Module* m)
+const std::string& ModuleManager::GetModuleName(Module* m)
{
- static std::string nothing; /* Prevent compiler warning */
-
- if (!this->GetModuleCount())
- return nothing;
+ static std::string nothing;
- for (int i = 0; i <= this->GetModuleCount(); i++)
+ for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
{
- if (this->modules[i] == m)
- {
- return this->Config->module_names[i];
- }
+ if (n->second.second == m)
+ return n->first;
}
- return nothing; /* As above */
+
+ return nothing;
}
/* This is ugly, yes, but hash_map's arent designed to be
* m_safelist possible, initially).
*/
-chanrec* InspIRCd::GetChannelIndex(long index)
+Channel* InspIRCd::GetChannelIndex(long index)
{
int target = 0;
for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
return NULL;
}
-bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
-{
- return match(sliteral.c_str(),spattern.c_str());
-}
-
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
{
- return this->Parser->CallHandler(commandname,parameters,pcnt,user);
+ return this->Parser->CallHandler(commandname, parameters, user);
}
-bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
{
return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-void InspIRCd::AddCommand(command_t *f)
+void InspIRCd::AddCommand(Command *f)
{
if (!this->Parser->CreateCommand(f))
{
}
}
-void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
+void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
{
- this->Modes->Process(parameters,pcnt,user,true);
+ this->Modes->Process(parameters, user, true);
}
-void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
{
std::string CompleteLine = LinePrefix;
std::string Word;
User->WriteServ(CompleteLine);
}
-userrec* FindDescriptorHandler::Call(int socket)
+User* FindDescriptorHandler::Call(int socket)
{
- return reinterpret_cast<userrec*>(Server->SE->GetRef(socket));
-}
-
-bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
-{
- return this->Modes->AddMode(mh,mode);
-}
-
-bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
-{
- return this->Modes->AddModeWatcher(mw);
-}
-
-bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
-{
- return this->Modes->DelModeWatcher(mw);
+ return reinterpret_cast<User*>(Server->SE->GetRef(socket));
}
bool InspIRCd::AddResolver(Resolver* r, bool cached)
}
}
-void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
- XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- XLines->apply_lines(APPLY_GLINES);
-}
-
-void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
-{
- XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
- XLines->apply_lines(APPLY_QLINES);
-}
-
-void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
-{
- XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
- XLines->apply_lines(APPLY_ZLINES);
-}
-
-void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
- XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- XLines->apply_lines(APPLY_KLINES);
-}
-
-void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
-{
- XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
-}
-
-bool InspIRCd::DelGLine(const std::string &hostmask)
-{
- return XLines->del_gline(hostmask.c_str());
-}
-
-bool InspIRCd::DelQLine(const std::string &nickname)
-{
- return XLines->del_qline(nickname.c_str());
-}
-
-bool InspIRCd::DelZLine(const std::string &ipaddr)
+Module* ModuleManager::Find(const std::string &name)
{
- return XLines->del_zline(ipaddr.c_str());
-}
-
-bool InspIRCd::DelKLine(const std::string &hostmask)
-{
- return XLines->del_kline(hostmask.c_str());
-}
-
-bool InspIRCd::DelELine(const std::string &hostmask)
-{
- return XLines->del_eline(hostmask.c_str());
-}
+ std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(name);
-/*
- * XXX why on *earth* is this in modules.cpp...? I think
- * perhaps we need a server.cpp for InspIRCd:: stuff where possible. -- w00t
- */
-bool InspIRCd::IsValidMask(const std::string &mask)
-{
- char* dest = (char*)mask.c_str();
- int exclamation = 0;
- int atsign = 0;
-
- for (char* i = dest; *i; i++)
- {
- /* out of range character, bad mask */
- if (*i < 32 || *i > 126)
- {
- return false;
- }
-
- switch (*i)
- {
- case '!':
- exclamation++;
- break;
- case '@':
- atsign++;
- break;
- }
- }
-
- /* valid masks only have 1 ! and @ */
- if (exclamation != 1 || atsign != 1)
- return false;
-
- return true;
+ if (modfind == Modules.end())
+ return NULL;
+ else
+ return modfind->second.second;
}
-Module* InspIRCd::FindModule(const std::string &name)
+const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
{
- for (int i = 0; i <= this->GetModuleCount(); i++)
- {
- if (this->Config->module_names[i] == name)
- {
- return this->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(InspIRCd* Instance) : ServerInstance(Instance)
{
- /* 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->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-
+ this->error = CONF_NO_ERROR;
this->data = &ServerInstance->Config->config_data;
this->privatehash = false;
+ this->error = 0;
}
{
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 = ServerInstance->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;
+ this->error = 0;
}
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* */
+ /* 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;
}
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, 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(!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;
}
-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, int index, bool need_positive)
{
- return ReadInteger(tag, name, "", index, needs_unsigned);
+ 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)
{
- ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
+ ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user->uuid);
}
projects / user / henk / code / inspircd.git / blobdiff