* ---------------------------------------------------
*/
+/* $Core: libIRCDmodules */
+
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
#include "socketengine.h"
#include "command_parse.h"
#include "dns.h"
-
+#include "exitcodes.h"
#ifndef WIN32
#include <dirent.h>
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) { }
+void Module::OnUserConnect(User*) { }
+void Module::OnUserQuit(User*, const std::string&, const std::string&) { }
+void Module::OnUserDisconnect(User*) { }
+void Module::OnUserJoin(User*, Channel*, 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&) { 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(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::OnOper(User*, const std::string&) { }
+void Module::OnPostOper(User*, const std::string&) { }
+void Module::OnInfo(User*) { }
+void Module::OnWhois(User*, User*) { }
+int Module::OnUserPreInvite(User*, User*, Channel*) { 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 char**, int, User *, bool, const std::string&) { return 0; }
+void Module::OnPostCommand(const std::string&, const char**, int, 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::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; }
+char* Module::OnRequest(Request*) { return NULL; }
+int Module::OnOperCompare(const std::string&, const std::string&, int) { 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*) { }
+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::OnCleanup(int, void*) { }
void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; }
-void Module::OnChannelDelete(chanrec* chan) { }
+void Module::OnChannelDelete(Channel*) { }
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) { }
+void Module::OnSetAway(User*) { }
+void Module::OnCancelAway(User*) { }
+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&) { }
-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)
+const char* ModuleManager::LastError()
{
- int v1 = 0;
- for (ModuleList::iterator m = modules.begin(); m!= modules.end(); m++)
+ return MODERR;
+}
+
+bool ModuleManager::Load(const char* filename)
+{
+ /* Do we have a glob pattern in the filename?
+ * The user wants to load multiple modules which
+ * match the pattern.
+ */
+ if (strchr(filename,'*') || (strchr(filename,'?')))
{
- if (v1 == j)
+ int n_match = 0;
+ DIR* library = opendir(Instance->Config->ModPath);
+ if (library)
{
- DELETE(*m);
- modules.erase(m);
- modules.push_back(NULL);
- break;
+ /* Try and locate and load all modules matching the pattern */
+ dirent* entry = NULL;
+ while ((entry = readdir(library)))
+ {
+ if (Instance->MatchText(entry->d_name, filename))
+ {
+ if (!this->Load(entry->d_name))
+ n_match++;
+ }
+ }
+ closedir(library);
}
- v1++;
+ /* 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);
+ }
+
+ char modfile[MAXBUF];
+ 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);
+ Instance->Log(DEFAULT, MODERR);
+ return false;
}
- int v2 = 0;
- for (std::vector<std::string>::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++)
+
+ if (!ServerConfig::FileExists(modfile))
{
- if (v2 == j)
+ snprintf(MODERR,MAXBUF,"Module file could not be found: %s", modfile);
+ Instance->Log(DEFAULT, MODERR);
+ return false;
+ }
+
+ if(find(Instance->Config->module_names.begin(), Instance->Config->module_names.end(), filename_str) != Instance->Config->module_names.end())
+ {
+ Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
+ snprintf(MODERR, MAXBUF, "Module already loaded");
+ return false;
+ }
+
+ Module* newmod;
+ ircd_module* newhandle;
+
+ newmod = NULL;
+ newhandle = NULL;
+
+ try
+ {
+ /* This will throw a CoreException if there's a problem loading
+ * the module file or getting a pointer to the init_module symbol.
+ */
+ newhandle = new ircd_module(Instance, modfile, "init_module");
+
+ handles[this->ModCount+1] = newhandle;
+
+ newmod = handles[this->ModCount+1]->CallInit();
+
+ if(newmod)
{
- Config->module_names.erase(v);
- break;
+ Version v = newmod->GetVersion();
+
+ if (v.API != API_VERSION)
+ {
+ delete newmod;
+ Instance->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
+ {
+ Instance->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]"));
+ }
+
+ modules[this->ModCount+1] = newmod;
+
+ /* save the module and the module's classfactory, if
+ * this isnt done, random crashes can occur :/ */
+ Instance->Config->module_names.push_back(filename);
+
+ char* x = &Instance->Config->implement_lists[this->ModCount+1][0];
+ for(int t = 0; t < 255; t++)
+ x[t] = 0;
+
+ modules[this->ModCount+1]->Implements(x);
+
+ for(int t = 0; t < 255; t++)
+ Instance->Config->global_implementation[t] += Instance->Config->implement_lists[this->ModCount+1][t];
+ }
+ else
+ {
+ Instance->Log(DEFAULT, "Unable to load %s",modfile);
+ snprintf(MODERR,MAXBUF, "Probably missing init_module() entrypoint, but dlsym() didn't notice a problem");
+ return false;
}
- v2++;
}
+ catch (LoadModuleException& modexcept)
+ {
+ Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
+ snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
+ return false;
+ }
+ catch (FindSymbolException& modexcept)
+ {
+ Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
+ snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
+ return false;
+ }
+ catch (CoreException& modexcept)
+ {
+ Instance->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());
+ return false;
+ }
+
+ this->ModCount++;
+ FOREACH_MOD_I(Instance,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 < Instance->Config->module_names.size(); j++)
+ {
+ if (modules[j]->Prioritize() == PRIORITY_LAST)
+ put_to_back.push_back(Instance->Config->module_names[j]);
+ else if (modules[j]->Prioritize() == PRIORITY_FIRST)
+ put_to_front.push_back(Instance->Config->module_names[j]);
+ else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
+ put_before[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8];
+ else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
+ put_after[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8];
+ }
+ 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);
+ Instance->BuildISupport();
+ return true;
+}
+bool ModuleManager::EraseHandle(unsigned int j)
+{
+ ModuleHandleList::iterator iter;
+
+ if (j >= handles.size())
+ {
+ return false;
+ }
+
+ iter = handles.begin() + j;
+
+ if(*iter)
+ {
+ delete *iter;
+ handles.erase(iter);
+ handles.push_back(NULL);
+ }
+
+ return true;
}
-void InspIRCd::MoveTo(std::string modulename,int slot)
+bool ModuleManager::EraseModule(unsigned int j)
+{
+ bool success = false;
+
+ ModuleList::iterator iter;
+
+ if (j >= modules.size())
+ {
+ return false;
+ }
+
+ iter = modules.begin() + j;
+
+ if (*iter)
+ {
+ delete *iter;
+ modules.erase(iter);
+ modules.push_back(NULL);
+ success = true;
+ }
+
+ std::vector<std::string>::iterator iter2;
+
+ if (j >= Instance->Config->module_names.size())
+ {
+ return false;
+ }
+
+ iter2 = Instance->Config->module_names.begin() + j;
+
+ Instance->Config->module_names.erase(iter2);
+ success = true;
+
+ return success;
+}
+
+void ModuleManager::MoveTo(std::string modulename,int slot)
{
unsigned int v2 = 256;
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
+
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
{
- if (Config->module_names[v] == modulename)
+ if (Instance->Config->module_names[v] == modulename)
{
// found an instance, swap it with the item at the end
v2 = v;
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;
+ Instance->Config->module_names[v2] = Instance->Config->module_names[slot];
+ Instance->Config->module_names[slot] = modulename;
// now swap the module factories
- ircd_module* temp = factory[v2];
- factory[v2] = factory[slot];
- factory[slot] = temp;
+ ircd_module* temp = handles[v2];
+ handles[v2] = handles[slot];
+ handles[slot] = temp;
// now swap the module objects
Module* temp_module = modules[v2];
modules[v2] = modules[slot];
// 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;
+ char x = Instance->Config->implement_lists[v2][n];
+ Instance->Config->implement_lists[v2][n] = Instance->Config->implement_lists[slot][n];
+ Instance->Config->implement_lists[slot][n] = x;
}
}
}
-void InspIRCd::MoveAfter(std::string modulename, std::string after)
+void ModuleManager::MoveAfter(std::string modulename, std::string after)
{
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
{
- if (Config->module_names[v] == after)
+ if (Instance->Config->module_names[v] == after)
{
MoveTo(modulename, v);
return;
}
}
-void InspIRCd::MoveBefore(std::string modulename, std::string before)
+void ModuleManager::MoveBefore(std::string modulename, std::string before)
{
- for (unsigned int v = 0; v < Config->module_names.size(); v++)
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
{
- if (Config->module_names[v] == before)
+ if (Instance->Config->module_names[v] == before)
{
if (v > 0)
{
}
}
-void InspIRCd::MoveToFirst(std::string modulename)
+void ModuleManager::MoveToFirst(std::string modulename)
{
MoveTo(modulename,0);
}
-void InspIRCd::MoveToLast(std::string modulename)
+void ModuleManager::MoveToLast(std::string modulename)
{
- MoveTo(modulename,this->GetModuleCount());
+ MoveTo(modulename,this->GetCount());
}
-bool InspIRCd::UnloadModule(const char* filename)
+bool ModuleManager::Unload(const char* filename)
{
std::string filename_str = filename;
- for (unsigned int j = 0; j != Config->module_names.size(); j++)
+ for (unsigned int j = 0; j != Instance->Config->module_names.size(); j++)
{
- if (Config->module_names[j] == filename_str)
+ if (Instance->Config->module_names[j] == filename_str)
{
if (modules[j]->GetVersion().Flags & VF_STATIC)
{
- this->Log(DEFAULT,"Failed to unload STATIC module %s",filename);
+ Instance->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());
+ Instance->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" : "",
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++)
+ for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
{
modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
}
- for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
+ for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++)
{
modules[j]->OnCleanup(TYPE_USER,u->second);
}
/* Tidy up any dangling resolvers */
- this->Res->CleanResolvers(modules[j]);
+ Instance->Res->CleanResolvers(modules[j]);
- FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
+ FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j]));
for(int t = 0; t < 255; t++)
{
- Config->global_implementation[t] -= Config->implement_lists[j][t];
+ Instance->Config->global_implementation[t] -= Instance->Config->implement_lists[j][t];
}
/* We have to renumber implement_lists after unload because the module numbers change!
{
for(int t = 0; t < 255; t++)
{
- Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t];
+ Instance->Config->implement_lists[j2][t] = Instance->Config->implement_lists[j2+1][t];
}
}
// found the module
- Parser->RemoveCommands(filename);
+ Instance->Parser->RemoveCommands(filename);
this->EraseModule(j);
- this->EraseFactory(j);
- this->Log(DEFAULT,"Module %s unloaded",filename);
+ this->EraseHandle(j);
+ Instance->Log(DEFAULT,"Module %s unloaded",filename);
this->ModCount--;
- BuildISupport();
+ Instance->BuildISupport();
return true;
}
}
- this->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
+ Instance->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
snprintf(MODERR,MAXBUF,"Module not loaded");
return false;
}
-bool InspIRCd::LoadModule(const char* filename)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
{
- /* Do we have a glob pattern in the filename?
- * The user wants to load multiple modules which
- * match the pattern.
- */
- if (strchr(filename,'*') || (strchr(filename,'?')))
- {
- int n_match = 0;
- DIR* library = opendir(Config->ModPath);
- if (library)
- {
- /* Try and locate and load all modules matching the pattern */
- dirent* entry = NULL;
- while ((entry = readdir(library)))
- {
- if (this->MatchText(entry->d_name, filename))
- {
- if (!this->LoadModule(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);
- }
+ char configToken[MAXBUF];
+ Instance->Config->module_names.clear();
+ ModCount = -1;
- char modfile[MAXBUF];
- snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
- std::string filename_str = filename;
-
- if (!ServerConfig::DirValid(modfile))
+ for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
{
- this->Log(DEFAULT,"Module %s is not within the modules directory.",modfile);
- snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
- return false;
- }
- 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
- {
- a = new ircd_module(this, modfile);
- factory[this->ModCount+1] = a;
- if (factory[this->ModCount+1]->LastError())
- {
- this->Log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError());
- snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError());
- return false;
- }
- if ((long)factory[this->ModCount+1]->factory != -1)
- {
- m = factory[this->ModCount+1]->factory->CreateModule(this);
-
- Version v = m->GetVersion();
-
- 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]"));
- }
-
- 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);
-
- char* x = &Config->implement_lists[this->ModCount+1][0];
- for(int t = 0; t < 255; t++)
- x[t] = 0;
-
- modules[this->ModCount+1]->Implements(x);
-
- for(int t = 0; t < 255; t++)
- Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t];
- }
- else
- {
- this->Log(DEFAULT,"Unable to load %s",modfile);
- snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
- return false;
- }
- }
- catch (CoreException& modexcept)
+ 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))
{
- 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());
- return false;
+ Instance->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->LastError());
+ printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->LastError());
+ Instance->Exit(EXIT_STATUS_MODULE);
}
}
- else
- {
- this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
- snprintf(MODERR,MAXBUF,"Module file could not be found");
- 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++)
- {
- 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];
- }
- 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();
- return true;
+ printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", (this->GetCount()+1), (this->GetCount()+1) == 1 ? " has" : "s have");
+ Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount()+1);
}
-long InspIRCd::PriorityAfter(const std::string &modulename)
+long ModuleManager::PriorityAfter(const std::string &modulename)
{
- for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
{
- if (this->Config->module_names[j] == modulename)
+ if (Instance->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_AFTER);
}
return PRIORITY_DONTCARE;
}
-long InspIRCd::PriorityBefore(const std::string &modulename)
+long ModuleManager::PriorityBefore(const std::string &modulename)
{
- for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
{
- if (this->Config->module_names[j] == modulename)
+ if (Instance->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_BEFORE);
}
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);
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);
return false;
}
-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)
+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())
+ if (!this->GetCount())
return nothing;
- for (int i = 0; i <= this->GetModuleCount(); i++)
+ for (int i = 0; i <= this->GetCount(); i++)
{
if (this->modules[i] == m)
{
- return this->Config->module_names[i];
+ return Instance->Config->module_names[i];
}
}
return nothing; /* As above */
* 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 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 char** parameters, int pcnt, User* user)
{
return this->Parser->CallHandler(commandname,parameters,pcnt,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 char** parameters, int pcnt, User *user)
{
this->Modes->Process(parameters,pcnt,user,true);
}
-void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(User* User, const std::string &LinePrefix, 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));
+ return reinterpret_cast<User*>(Server->SE->GetRef(socket));
}
-bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
+bool InspIRCd::AddMode(ModeHandler* mh)
{
- return this->Modes->AddMode(mh,mode);
+ return this->Modes->AddMode(mh);
}
bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
}
}
-void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+Module* ModuleManager::Find(const std::string &name)
{
- 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)
-{
- 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());
-}
-
-/*
- * 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++)
+ for (int i = 0; i <= this->GetCount(); 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;
-}
-
-Module* InspIRCd::FindModule(const std::string &name)
-{
- for (int i = 0; i <= this->GetModuleCount(); i++)
- {
- if (this->Config->module_names[i] == name)
+ if (Instance->Config->module_names[i] == name)
{
return this->modules[i];
}
* 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;
}
ConfigReader::~ConfigReader()
{
if (this->errorlog)
- DELETE(this->errorlog);
+ delete this->errorlog;
if(this->privatehash)
- DELETE(this->data);
+ delete this->data;
}
{
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);
}
-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;
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);
}
{
return fc.size();
}
-
-
projects / user / henk / code / inspircd.git / blobdiff