* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-//#include "inspircd.h"
-#include "configreader.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
-#include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
+#include "inspircd.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 "inspircd.h"
+#include "exitcodes.h"
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern ModuleList modules;
-extern FactoryList factory;
-extern time_t TIME;
-extern command_table cmdlist;
-
-class Server;
-
-featurelist Features;
+#ifndef WIN32
+ #include <dirent.h>
+#endif
// version is a simple class for holding a modules version number
-
-Version::Version(int major, int minor, int revision, int build, int flags)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags)
-{
-}
-
-// admin is a simple class for holding a server's administrative info
-
-Admin::Admin(std::string name, std::string email, std::string nick)
-: Name(name), Email(email), Nick(nick)
+Version::Version(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)
{
}
Request::Request(Module* src, Module* dst, const char* idstr)
: id(idstr), source(src), dest(dst)
{
-};
+}
char* Request::GetData()
{
}
}
-Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { };
+Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }
char* Event::GetData()
{
return this->source;
}
-char* Event::Send()
+char* Event::Send(InspIRCd* ServerInstance)
{
FOREACH_MOD(I_OnEvent,OnEvent(this));
return NULL;
// These declarations define the behavours of the base class Module (which does nothing at all)
- Module::Module(Server* Me) { }
+ Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
Module::~Module() { }
void Module::OnUserConnect(userrec* user) { }
-void Module::OnUserQuit(userrec* user, const std::string& message) { }
+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) { }
-void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
-void Module::OnRehash(const std::string ¶meter) { }
+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) { return 0; }
-void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
-Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void Module::OnOper(userrec* user, const std::string &opertype) { };
-void Module::OnPostOper(userrec* user, const std::string &opertype) { };
-void Module::OnInfo(userrec* user) { };
-void Module::OnWhois(userrec* source, userrec* dest) { };
-int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
-int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { return 0; };
-int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; };
-void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { };
-int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; };
-void Module::On005Numeric(std::string &output) { };
-int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; };
-void Module::OnLoadModule(Module* mod,const std::string &name) { };
-void Module::OnUnloadModule(Module* mod,const std::string &name) { };
-void Module::OnBackgroundTimer(time_t curtime) { };
-int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated) { return 0; };
-bool Module::OnCheckReady(userrec* user) { return true; };
-void Module::OnUserRegister(userrec* user) { };
-int Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
-int Module::OnRawMode(userrec* user, chanrec* chan, char mode, const std::string ¶m, bool adding, int pcnt) { return 0; };
-int Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
-int Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
-int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; };
-int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; };
-int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; };
-int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; };
-int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; };
-void Module::OnEvent(Event* event) { return; };
-char* Module::OnRequest(Request* request) { return NULL; };
-int Module::OnOperCompare(const std::string &password, const std::string &input) { return 0; };
-void Module::OnGlobalOper(userrec* user) { };
-void Module::OnGlobalConnect(userrec* user) { };
-int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; };
-void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { };
-int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; };
-void Module::OnRawSocketClose(int fd) { };
-int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
-void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
-void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason) { };
-void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
-void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
-void Module::OnGetServerDescription(const std::string &servername,std::string &description) { };
-void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
-void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
-void Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
-void Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
-void Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
-void Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
-void Module::OnWallops(userrec* user, const std::string &text) { };
-void Module::OnChangeHost(userrec* user, const std::string &newhost) { };
-void Module::OnChangeName(userrec* user, const std::string &gecos) { };
-void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { };
-void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { };
-void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { };
-void Module::OnDelGLine(userrec* source, const std::string &hostmask) { };
-void Module::OnDelZLine(userrec* source, const std::string &ipmask) { };
-void Module::OnDelKLine(userrec* source, const std::string &hostmask) { };
-void Module::OnDelQLine(userrec* source, const std::string &nickmask) { };
-void Module::OnDelELine(userrec* source, const std::string &hostmask) { };
-void Module::OnCleanup(int target_type, void* item) { };
-void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; };
-void Module::OnChannelDelete(chanrec* chan) { };
+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) { };
+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, const std::string &text) { }
+void Module::OnGarbageCollect() { }
+void Module::OnBufferFlushed(userrec* user) { }
-/* server is a wrapper class that provides methods to all of the C-style
- * exports in the core
- */
-Server::Server()
+ModuleManager::ModuleManager(InspIRCd* Ins)
+: ModCount(0), Instance(Ins)
+{
+}
+
+ModuleManager::~ModuleManager()
+{
+}
+
+const char* ModuleManager::LastError()
+{
+ 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,'?')))
+ {
+ 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 ((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);
+ }
+
+ 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;
+ }
+
+ if (!ServerConfig::FileExists(modfile))
+ {
+ 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)
+ {
+ 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;
+ }
+ }
+ 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 < 0) || (j >= handles.size()))
+ {
+ return false;
+ }
+
+ iter = handles.begin() + j;
+
+ if(*iter)
+ {
+ delete *iter;
+ handles.erase(iter);
+ handles.push_back(NULL);
+ }
+
+ return true;
}
-Server::~Server()
+bool ModuleManager::EraseModule(unsigned int j)
{
+ bool success = false;
+
+ {
+ ModuleList::iterator iter;
+
+ if((j < 0) || (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 iter;
+
+ if((j < 0) || (j >= Instance->Config->module_names.size()))
+ {
+ return false;
+ }
+
+ iter = Instance->Config->module_names.begin() + j;
+
+ Instance->Config->module_names.erase(iter);
+ success = true;
+ }
+
+ return success;
}
-void Server::AddSocket(InspSocket* sock)
+void ModuleManager::MoveTo(std::string modulename,int slot)
{
- ServerInstance->module_sockets.push_back(sock);
+ unsigned int v2 = 256;
+
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+ {
+ if (Instance->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
+ Instance->Config->module_names[v2] = Instance->Config->module_names[slot];
+ Instance->Config->module_names[slot] = modulename;
+ // now swap the module factories
+ 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];
+ 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 = 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 ModuleManager::MoveAfter(std::string modulename, std::string after)
+{
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+ {
+ if (Instance->Config->module_names[v] == after)
+ {
+ MoveTo(modulename, v);
+ return;
+ }
+ }
+}
+
+void ModuleManager::MoveBefore(std::string modulename, std::string before)
+{
+ for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+ {
+ if (Instance->Config->module_names[v] == before)
+ {
+ if (v > 0)
+ {
+ MoveTo(modulename, v-1);
+ }
+ else
+ {
+ MoveTo(modulename, v);
+ }
+ return;
+ }
+ }
+}
+
+void ModuleManager::MoveToFirst(std::string modulename)
+{
+ MoveTo(modulename,0);
+}
+
+void ModuleManager::MoveToLast(std::string modulename)
+{
+ MoveTo(modulename,this->GetCount());
+}
+
+bool ModuleManager::Unload(const char* filename)
+{
+ std::string filename_str = filename;
+ for (unsigned int j = 0; j != Instance->Config->module_names.size(); j++)
+ {
+ if (Instance->Config->module_names[j] == filename_str)
+ {
+ if (modules[j]->GetVersion().Flags & VF_STATIC)
+ {
+ 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)
+ {
+ 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" : "",
+ 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 = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
+ {
+ modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
+ }
+ 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 */
+ Instance->Res->CleanResolvers(modules[j]);
+
+ FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j]));
+
+ for(int t = 0; t < 255; 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 j2 = j; j2 < 254; j2++)
+ {
+ for(int t = 0; t < 255; t++)
+ {
+ Instance->Config->implement_lists[j2][t] = Instance->Config->implement_lists[j2+1][t];
+ }
+ }
+
+ // found the module
+ Instance->Parser->RemoveCommands(filename);
+ this->EraseModule(j);
+ this->EraseHandle(j);
+ Instance->Log(DEFAULT,"Module %s unloaded",filename);
+ this->ModCount--;
+ Instance->BuildISupport();
+ return true;
+ }
+ }
+ Instance->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
+ snprintf(MODERR,MAXBUF,"Module not loaded");
+ return false;
}
-void Server::RemoveSocket(InspSocket* sock)
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
{
- for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
+ char configToken[MAXBUF];
+ Instance->Config->module_names.clear();
+ ModCount = -1;
+
+ for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
{
- InspSocket* s = (InspSocket*)*a;
- if (s == sock)
- s->MarkAsClosed();
+ 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->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);
+ }
}
+ 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());
}
-long Server::PriorityAfter(const std::string &modulename)
+long ModuleManager::PriorityAfter(const std::string &modulename)
{
- for (unsigned int j = 0; j < ServerInstance->Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
{
- if (ServerInstance->Config->module_names[j] == modulename)
+ if (Instance->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_AFTER);
}
return PRIORITY_DONTCARE;
}
-long Server::PriorityBefore(const std::string &modulename)
+long ModuleManager::PriorityBefore(const std::string &modulename)
{
- for (unsigned int j = 0; j < ServerInstance->Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
{
- if (ServerInstance->Config->module_names[j] == modulename)
+ if (Instance->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_BEFORE);
}
return PRIORITY_DONTCARE;
}
-bool Server::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 Server::UnpublishFeature(const std::string &FeatureName)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
return true;
}
-Module* Server::FindFeature(const std::string &FeatureName)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
{
featurelist::iterator iter = Features.find(FeatureName);
return iter->second;
}
-const std::string& Server::GetModuleName(Module* m)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
- static std::string nothing = ""; /* Prevent compiler warning */
- for (int i = 0; i <= MODCOUNT; i++)
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+ if (iter == Interfaces.end())
+ {
+ modulelist ml;
+ ml.push_back(Mod);
+ Interfaces[InterfaceName] = std::make_pair(0, ml);
+ return true;
+ }
+ else
{
- if (modules[i] == m)
+ iter->second.second.push_back(Mod);
+ return true;
+ }
+ return false;
+}
+
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+{
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+
+ if (iter == Interfaces.end())
+ return false;
+
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+ {
+ if (*x == Mod)
{
- return ServerInstance->Config->module_names[i];
+ iter->second.second.erase(x);
+ if (iter->second.second.empty())
+ Interfaces.erase(InterfaceName);
+ return true;
}
}
- return nothing; /* As above */
+ return false;
+}
+
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
+{
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter == Interfaces.end())
+ return NULL;
+ else
+ return &(iter->second.second);
}
-void Server::RehashServer()
+void ModuleManager::UseInterface(const std::string &InterfaceName)
{
- ServerInstance->WriteOpers("*** Rehashing config file");
- ServerInstance->Config->Read(false,NULL);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first++;
+
}
-void Server::DelSocket(InspSocket* sock)
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
{
- for (std::vector<InspSocket*>::iterator a = ServerInstance->module_sockets.begin(); a < ServerInstance->module_sockets.end(); a++)
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first--;
+}
+
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
+{
+ for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
- if (*a == sock)
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
{
- ServerInstance->module_sockets.erase(a);
- return;
+ if (*x == m)
+ {
+ return std::make_pair(iter->second.first, iter->first);
+ }
}
}
+ return std::make_pair(0, "");
}
-long Server::GetChannelCount()
+const std::string& ModuleManager::GetModuleName(Module* m)
{
- return (long)ServerInstance->chanlist.size();
+ static std::string nothing; /* Prevent compiler warning */
+
+ if (!this->GetCount())
+ return nothing;
+
+ for (int i = 0; i <= this->GetCount(); i++)
+ {
+ if (this->modules[i] == m)
+ {
+ return Instance->Config->module_names[i];
+ }
+ }
+ return nothing; /* As above */
}
/* This is ugly, yes, but hash_map's arent designed to be
* m_safelist possible, initially).
*/
-chanrec* Server::GetChannelIndex(long index)
+chanrec* InspIRCd::GetChannelIndex(long index)
{
int target = 0;
- for (chan_hash::iterator n = ServerInstance->chanlist.begin(); n != ServerInstance->chanlist.end(); n++, target++)
+ for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
{
if (index == target)
return n->second;
return NULL;
}
-bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
+bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
{
return match(sliteral.c_str(),spattern.c_str());
}
-bool Server::IsUlined(const std::string &server)
-{
- return is_uline(server.c_str());
-}
-
-bool Server::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
-{
- return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
-}
-
-bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
{
- return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
+ return this->Parser->CallHandler(commandname,parameters,pcnt,user);
}
-void Server::Log(int level, const std::string &s)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
{
- log(level,"%s",s.c_str());
+ return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-void Server::AddCommand(command_t *f)
+void InspIRCd::AddCommand(command_t *f)
{
- if (!ServerInstance->Parser->CreateCommand(f))
+ if (!this->Parser->CreateCommand(f))
{
ModuleException err("Command "+std::string(f->command)+" already exists.");
throw (err);
}
}
-void Server::SendMode(const char** parameters, int pcnt, userrec *user)
+void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
{
- ServerInstance->ModeGrok->Process(parameters,pcnt,user,true);
+ this->Modes->Process(parameters,pcnt,user,true);
}
-void Server::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
+void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream)
{
std::string CompleteLine = LinePrefix;
- std::string Word = "";
+ std::string Word;
while (TextStream >> Word)
{
if (CompleteLine.length() + Word.length() + 3 > 500)
User->WriteServ(CompleteLine);
}
-bool Server::IsNick(const std::string &nick)
-{
- return (isnick(nick.c_str()) != 0);
-}
-
-userrec* Server::FindDescriptor(int socket)
-{
- return (socket < 65536 ? ServerInstance->fd_ref_table[socket] : NULL);
-}
-
-std::string Server::ChanMode(userrec* User, chanrec* Chan)
-{
- return cmode(User,Chan);
-}
-
-std::string Server::GetServerName()
-{
- return ServerInstance->Config->ServerName;
-}
-
-std::string Server::GetNetworkName()
-{
- return ServerInstance->Config->Network;
-}
-
-std::string Server::GetServerDescription()
-{
- return ServerInstance->Config->ServerDesc;
-}
-
-Admin Server::GetAdmin()
-{
- return Admin(ServerInstance->Config->AdminName,ServerInstance->Config->AdminEmail,ServerInstance->Config->AdminNick);
-}
-
-
-bool Server::AddMode(ModeHandler* mh, const unsigned char mode)
-{
- return ServerInstance->ModeGrok->AddMode(mh,mode);
-}
-
-bool Server::AddModeWatcher(ModeWatcher* mw)
+userrec* FindDescriptorHandler::Call(int socket)
{
- return ServerInstance->ModeGrok->AddModeWatcher(mw);
+ return reinterpret_cast<userrec*>(Server->SE->GetRef(socket));
}
-bool Server::DelModeWatcher(ModeWatcher* mw)
+bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
{
- return ServerInstance->ModeGrok->DelModeWatcher(mw);
+ return this->Modes->AddMode(mh,mode);
}
-bool Server::AddResolver(Resolver* r)
+bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
{
- return ServerInstance->Res->AddResolverClass(r);
+ return this->Modes->AddModeWatcher(mw);
}
-bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
+bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
{
- unsigned int old_fd = user->fd;
- user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
- user->FlushWriteBuf();
- user->ClearBuffer();
- user->fd = FD_MAGIC_NUMBER;
-
- if (find(local_users.begin(),local_users.end(),user) != local_users.end())
- {
- local_users.erase(find(local_users.begin(),local_users.end(),user));
- log(DEBUG,"Delete local user");
- }
-
- ServerInstance->SE->DelFd(old_fd);
- shutdown(old_fd,2);
- close(old_fd);
- return true;
+ return this->Modes->DelModeWatcher(mw);
}
-bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
+bool InspIRCd::AddResolver(Resolver* r, bool cached)
{
- log(DEBUG,"PseudoToUser");
- zombie->fd = alive->fd;
- FOREACH_MOD(I_OnUserQuit,OnUserQuit(alive,message));
- alive->fd = FD_MAGIC_NUMBER;
- alive->FlushWriteBuf();
- alive->ClearBuffer();
- // save these for later
- std::string oldnick = alive->nick;
- std::string oldhost = alive->host;
- std::string oldident = alive->ident;
- userrec::QuitUser(this,alive,message.c_str());
- if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
- {
- local_users.erase(find(local_users.begin(),local_users.end(),alive));
- log(DEBUG,"Delete local user");
- }
- // Fix by brain - cant write the user until their fd table entry is updated
- ServerInstance->fd_ref_table[zombie->fd] = zombie;
- zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
- for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
+ if (!cached)
+ return this->Res->AddResolverClass(r);
+ else
{
- if (((ucrec*)(*i))->channel != NULL)
- {
- chanrec* Ptr = ((ucrec*)(*i))->channel;
- zombie->WriteFrom(zombie,"JOIN %s",Ptr->name);
- if (Ptr->topicset)
- {
- zombie->WriteServ("332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
- zombie->WriteServ("333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
- }
- Ptr->UserList(zombie);
- zombie->WriteServ("366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
- }
+ r->TriggerCachedResult();
+ delete r;
+ return true;
}
- if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
- local_users.push_back(zombie);
-
- return true;
}
-void Server::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_GLINES);
+ XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->apply_lines(APPLY_GLINES);
}
-void Server::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
+void InspIRCd::AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname)
{
- add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
- apply_lines(APPLY_QLINES);
+ XLines->add_qline(duration, source.c_str(), reason.c_str(), nickname.c_str());
+ XLines->apply_lines(APPLY_QLINES);
}
-void Server::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
+void InspIRCd::AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr)
{
- add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
- apply_lines(APPLY_ZLINES);
+ XLines->add_zline(duration, source.c_str(), reason.c_str(), ipaddr.c_str());
+ XLines->apply_lines(APPLY_ZLINES);
}
-void Server::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+void InspIRCd::AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
- apply_lines(APPLY_KLINES);
+ XLines->add_kline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->apply_lines(APPLY_KLINES);
}
-void Server::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
+void InspIRCd::AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
{
- add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
+ XLines->add_eline(duration, source.c_str(), reason.c_str(), hostmask.c_str());
}
-bool Server::DelGLine(const std::string &hostmask)
+bool InspIRCd::DelGLine(const std::string &hostmask)
{
- return del_gline(hostmask.c_str());
+ return XLines->del_gline(hostmask.c_str());
}
-bool Server::DelQLine(const std::string &nickname)
+bool InspIRCd::DelQLine(const std::string &nickname)
{
- return del_qline(nickname.c_str());
+ return XLines->del_qline(nickname.c_str());
}
-bool Server::DelZLine(const std::string &ipaddr)
+bool InspIRCd::DelZLine(const std::string &ipaddr)
{
- return del_zline(ipaddr.c_str());
+ return XLines->del_zline(ipaddr.c_str());
}
-bool Server::DelKLine(const std::string &hostmask)
+bool InspIRCd::DelKLine(const std::string &hostmask)
{
- return del_kline(hostmask.c_str());
+ return XLines->del_kline(hostmask.c_str());
}
-bool Server::DelELine(const std::string &hostmask)
+bool InspIRCd::DelELine(const std::string &hostmask)
{
- return del_eline(hostmask.c_str());
-}
-
-long Server::CalcDuration(const std::string &delta)
-{
- return duration(delta.c_str());
+ 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 Server:: stuff where possible. -- w00t
+ * perhaps we need a server.cpp for InspIRCd:: stuff where possible. -- w00t
*/
-bool Server::IsValidMask(const std::string &mask)
+bool InspIRCd::IsValidMask(const std::string &mask)
{
char* dest = (char*)mask.c_str();
- if (strchr(dest,'!')==0)
- return false;
- if (strchr(dest,'@')==0)
- return false;
- for (char* i = dest; *i; i++)
- if (*i < 32)
- return false;
+ int exclamation = 0;
+ int atsign = 0;
+
for (char* i = dest; *i; i++)
- if (*i > 126)
+ {
+ /* out of range character, bad mask */
+ if (*i < 32 || *i > 126)
+ {
return false;
- unsigned int c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '!')
- c++;
- if (c>1)
- return false;
- c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '@')
- c++;
- if (c>1)
+ }
+
+ switch (*i)
+ {
+ case '!':
+ exclamation++;
+ break;
+ case '@':
+ atsign++;
+ break;
+ }
+ }
+
+ /* valid masks only have 1 ! and @ */
+ if (exclamation != 1 || atsign != 1)
return false;
return true;
}
-Module* Server::FindModule(const std::string &name)
+Module* ModuleManager::Find(const std::string &name)
{
- for (int i = 0; i <= MODCOUNT; i++)
+ for (int i = 0; i <= this->GetCount(); i++)
{
- if (ServerInstance->Config->module_names[i] == name)
+ if (Instance->Config->module_names[i] == name)
{
- return modules[i];
+ return this->modules[i];
}
}
return NULL;
}
-ConfigReader::ConfigReader()
+ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
{
- // ServerInstance->Config->ClearStack();
-
/* Is there any reason to load the entire config file again here?
* it's needed if they specify another config file, but using the
* default one we can just use the global config data - pre-parsed!
*/
- //~ this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-
- //~ this->readerror = ServerInstance->Config->LoadConf(CONFIG_FILE, this->cache,this->errorlog);
- //~ if (!this->readerror)
- //~ this->error = CONF_FILE_NOT_FOUND;
-
+ this->error = CONF_NO_ERROR;
this->data = &ServerInstance->Config->config_data;
this->privatehash = false;
}
ConfigReader::~ConfigReader()
{
- //~ if (this->cache)
- //~ delete this->cache;
if (this->errorlog)
- DELETE(this->errorlog);
+ delete this->errorlog;
if(this->privatehash)
- DELETE(this->data);
+ delete this->data;
}
-ConfigReader::ConfigReader(const std::string &filename)
+ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
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);
if (!this->readerror)
this->error = CONF_FILE_NOT_FOUND;
-};
+}
+
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index)
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
{
/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
std::string result;
- if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
- return "";
}
-
return result;
}
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
+{
+ return ReadValue(tag, name, "", index, allow_linefeeds);
+}
+
+bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
+{
+ return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index);
+}
+
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
- return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
+ return ReadFlag(tag, name, "", index);
}
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
{
int result;
- if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result))
+ if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
}
- if ((needs_unsigned) && (result < 0))
+ if ((need_positive) && (result < 0))
{
- this->error = CONF_NOT_UNSIGNED;
+ this->error = CONF_INT_NEGATIVE;
return 0;
}
return result;
}
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool need_positive)
+{
+ return ReadInteger(tag, name, "", index, need_positive);
+}
+
long ConfigReader::GetError()
{
long olderr = this->error;
void ConfigReader::DumpErrors(bool bail, userrec* user)
{
- /* XXX - Duplicated code */
-
- if (bail)
- {
- printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
- Exit(0);
- }
- else
- {
- std::string errors = this->errorlog->str();
- std::string::size_type start;
- unsigned int prefixlen;
-
- start = 0;
- /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
- prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11;
-
- if (user)
- {
- user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
-
- while(start < errors.length())
- {
- user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
- start += 510 - prefixlen;
- }
- }
- else
- {
- ServerInstance->WriteOpers("There were errors in the configuration file:");
-
- while(start < errors.length())
- {
- ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
- start += 360;
- }
- }
-
- return;
- }
+ ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
}
}
-FileReader::FileReader(const std::string &filename)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- file_cache c;
- ServerInstance->Config->ReadFile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ LoadFile(filename);
}
-FileReader::FileReader()
+FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
{
}
std::string FileReader::Contents()
{
- std::string x = "";
+ std::string x;
for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
{
x.append(*a);
void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- ServerInstance->Config->ReadFile(c,filename.c_str());
- this->fc = c;
- this->CalcSize();
+ c.clear();
+ if (ServerInstance->Config->ReadFile(c,filename.c_str()))
+ {
+ this->fc = c;
+ this->CalcSize();
+ }
}
{
return fc.size();
}
-
-
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT = -1;
projects / user / henk / code / inspircd.git / blobdiff