* ---------------------------------------------------
*/
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
#include "users.h"
-#include "ctables.h"
-#include "globals.h"
#include "modules.h"
-#include "dynamic.h"
#include "wildcard.h"
-#include "message.h"
#include "mode.h"
#include "xline.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
#include "socket.h"
#include "socketengine.h"
-#include "typedefs.h"
-#include "modules.h"
#include "command_parse.h"
+#include "dns.h"
+#include "inspircd.h"
-extern ServerConfig *Config;
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
-extern std::vector<userrec*> local_users;
-extern time_t TIME;
-class Server;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
-
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern command_table cmdlist;
-ExtModeList EMode;
-
-// returns true if an extended mode character is in use
-bool ModeDefined(char modechar, int type)
-{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return true;
- }
- }
- return false;
-}
-
-bool ModeIsListMode(char modechar, int type)
-{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type) && (i->list == true))
- {
- return true;
- }
- }
- return false;
-}
-
-bool ModeDefinedOper(char modechar, int type)
+// version is a simple class for holding a modules version number
+Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
+: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type) && (i->needsoper == true))
- {
- return true;
- }
- }
- return false;
}
-// returns number of parameters for a custom mode when it is switched on
-int ModeDefinedOn(char modechar, int type)
+Request::Request(char* anydata, Module* src, Module* dst)
+: data(anydata), source(src), dest(dst)
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return i->params_when_on;
- }
- }
- return 0;
+ /* Ensure that because this module doesnt support ID strings, it doesnt break modules that do
+ * by passing them uninitialized pointers (could happen)
+ */
+ id = '\0';
}
-// returns number of parameters for a custom mode when it is switched on
-int ModeDefinedOff(char modechar, int type)
+Request::Request(Module* src, Module* dst, const char* idstr)
+: id(idstr), source(src), dest(dst)
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == type))
- {
- return i->params_when_off;
- }
- }
- return 0;
-}
+};
-// returns true if an extended mode character is in use
-bool DoAddExtendedMode(char modechar, int type, bool requires_oper, int params_on, int params_off)
+char* Request::GetData()
{
- if (ModeDefined(modechar,type)) {
- return false;
- }
- EMode.push_back(ExtMode(modechar,type,requires_oper,params_on,params_off));
- return true;
+ return this->data;
}
-// turns a mode into a listmode
-void ModeMakeList(char modechar)
+const char* Request::GetId()
{
- for (ExtModeListIter i = EMode.begin(); i < EMode.end(); i++)
- {
- if ((i->modechar == modechar) && (i->type == MT_CHANNEL))
- {
- i->list = true;
- return;
- }
- }
- return;
-}
-
-// version is a simple class for holding a modules version number
-
-Version::Version(int major, int minor, int revision, int build, int flags) : Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags) { };
-
-// admin is a simple class for holding a server's administrative info
-
-Admin::Admin(std::string name, std::string email, std::string nick) : Name(name), Email(email), Nick(nick) { };
-
-Request::Request(char* anydata, Module* src, Module* dst) : data(anydata), source(src), dest(dst) { };
-
-char* Request::GetData()
-{
- return this->data;
+ return this->id;
}
Module* Request::GetSource()
char* Event::GetData()
{
- return this->data;
+ return (char*)this->data;
}
Module* Event::GetSource()
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::OnUserDisconnect(userrec* user) { }
void Module::OnUserJoin(userrec* user, chanrec* channel) { }
+void Module::OnPostJoin(userrec* user, chanrec* channel) { }
void Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
void Module::OnRehash(const std::string ¶meter) { }
void Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
-int Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
-int Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) { return false; }
+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); }
+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) { return 0; };
-int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status) { 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::OnLoadModule(Module* mod,const std::string &name) { };
void Module::OnUnloadModule(Module* mod,const std::string &name) { };
void Module::OnBackgroundTimer(time_t curtime) { };
-void Module::OnSendList(userrec* user, chanrec* channel, char mode) { };
-int Module::OnPreCommand(const std::string &command, char **parameters, int pcnt, userrec *user, bool validated) { return 0; };
+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; };
-void Module::OnUserRegister(userrec* user) { };
+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) { };
-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) { 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; };
+int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; };
void Module::OnGlobalOper(userrec* user) { };
-void Module::OnGlobalConnect(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, char* buffer, int count) { return 0; };
+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) { };
-void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status) { };
+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) { };
void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { };
void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { };
Priority Module::Prioritize() { return PRIORITY_DONTCARE; }
void Module::OnSetAway(userrec* user) { };
void Module::OnCancelAway(userrec* user) { };
+int Module::OnUserList(userrec* user, chanrec* Ptr) { 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) { };
-/* server is a wrapper class that provides methods to all of the C-style
- * exports in the core
- */
-
-Server::Server()
-{
-}
-
-Server::~Server()
-{
-}
-
-void Server::AddSocket(InspSocket* sock)
-{
- module_sockets.push_back(sock);
-}
-
-void Server::RemoveSocket(InspSocket* sock)
+long InspIRCd::PriorityAfter(const std::string &modulename)
{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
- {
- InspSocket* s = (InspSocket*)*a;
- if (s == sock)
- s->MarkAsClosed();
- }
-}
-
-long Server::PriorityAfter(const std::string &modulename)
-{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
{
- if (Config->module_names[j] == modulename)
+ if (this->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_AFTER);
}
return PRIORITY_DONTCARE;
}
-long Server::PriorityBefore(const std::string &modulename)
+long InspIRCd::PriorityBefore(const std::string &modulename)
{
- for (unsigned int j = 0; j < Config->module_names.size(); j++)
+ for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
{
- if (Config->module_names[j] == modulename)
+ if (this->Config->module_names[j] == modulename)
{
return ((j << 8) | PRIORITY_BEFORE);
}
return PRIORITY_DONTCARE;
}
-void Server::RehashServer()
-{
- WriteOpers("*** Rehashing config file");
- Config->Read(false,NULL);
-}
-
-ServerConfig* Server::GetConfig()
-{
- return Config;
-}
-
-std::string Server::GetVersion()
-{
- return ServerInstance->GetVersionString();
-}
-
-void Server::DelSocket(InspSocket* sock)
-{
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
- {
- if (*a == sock)
- {
- module_sockets.erase(a);
- return;
- }
- }
-}
-
-long Server::GetChannelCount()
-{
- return (long)chanlist.size();
-}
-
-/* This is ugly, yes, but hash_map's arent designed to be
- * addressed in this manner, and this is a bit of a kludge.
- * Luckily its a specialist function and rarely used by
- * many modules (in fact, it was specially created to make
- * m_safelist possible, initially).
- */
-
-chanrec* Server::GetChannelIndex(long index)
+bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
{
- int target = 0;
- for (chan_hash::iterator n = chanlist.begin(); n != chanlist.end(); n++, target++)
+ if (Features.find(FeatureName) == Features.end())
{
- if (index == target)
- return n->second;
+ Features[FeatureName] = Mod;
+ return true;
}
- return NULL;
-}
-
-void Server::AddTimer(InspTimer* T)
-{
- ::AddTimer(T);
+ return false;
}
-void Server::SendOpers(const std::string &s)
+bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
{
- WriteOpers("%s",s.c_str());
-}
+ featurelist::iterator iter = Features.find(FeatureName);
+
+ if (iter == Features.end())
+ return false;
-bool Server::MatchText(const std::string &sliteral, const std::string &spattern)
-{
- return match(sliteral.c_str(),spattern.c_str());
+ Features.erase(iter);
+ return true;
}
-void Server::SendToModeMask(const std::string &modes, int flags, const std::string &text)
+Module* InspIRCd::FindFeature(const std::string &FeatureName)
{
- WriteMode(modes.c_str(),flags,"%s",text.c_str());
-}
+ featurelist::iterator iter = Features.find(FeatureName);
-chanrec* Server::JoinUserToChannel(userrec* user, const std::string &cname, const std::string &key)
-{
- return add_channel(user,cname.c_str(),key.c_str(),false);
-}
+ if (iter == Features.end())
+ return NULL;
-chanrec* Server::PartUserFromChannel(userrec* user, const std::string &cname, const std::string &reason)
-{
- return del_channel(user,cname.c_str(),reason.c_str(),false);
+ return iter->second;
}
-chanuserlist Server::GetUsers(chanrec* chan)
-{
- chanuserlist userl;
- userl.clear();
- CUList *list = chan->GetUsers();
- for (CUList::iterator i = list->begin(); i != list->end(); i++)
- userl.push_back(i->second);
- return userl;
-}
-void Server::ChangeUserNick(userrec* user, const std::string &nickname)
+bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod)
{
- force_nickchange(user,nickname.c_str());
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-void Server::KickUser(userrec* source, userrec* target, chanrec* chan, const std::string &reason)
-{
- if (source)
+ if (iter == Interfaces.end())
{
- kick_channel(source,target,chan,(char*)reason.c_str());
+ modulelist ml;
+ ml.push_back(Mod);
+ Interfaces[InterfaceName] = std::make_pair(0, ml);
+ return true;
}
else
{
- server_kick_channel(target,chan,(char*)reason.c_str(),true);
+ iter->second.second.push_back(Mod);
+ return true;
}
+ return false;
}
-void Server::QuitUser(userrec* user, const std::string &reason)
+bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
{
- kill_link(user,reason.c_str());
-}
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
-bool Server::IsUlined(const std::string &server)
-{
- return is_uline(server.c_str());
+ if (iter == Interfaces.end())
+ return false;
+
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+ {
+ if (*x == Mod)
+ {
+ iter->second.second.erase(x);
+ if (iter->second.second.empty())
+ Interfaces.erase(InterfaceName);
+ return true;
+ }
+ }
+ return false;
}
-bool Server::CallCommandHandler(const std::string &commandname, char** parameters, int pcnt, userrec* user)
+modulelist* InspIRCd::FindInterface(const std::string &InterfaceName)
{
- return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter == Interfaces.end())
+ return NULL;
+ else
+ return &(iter->second.second);
}
-bool Server::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
+void InspIRCd::UseInterface(const std::string &InterfaceName)
{
- return ServerInstance->Parser->IsValidCommand(commandname, pcnt, user);
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first++;
+
}
-void Server::Log(int level, const std::string &s)
+void InspIRCd::DoneWithInterface(const std::string &InterfaceName)
{
- log(level,"%s",s.c_str());
+ interfacelist::iterator iter = Interfaces.find(InterfaceName);
+ if (iter != Interfaces.end())
+ iter->second.first--;
}
-void Server::AddCommand(command_t *f)
+std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
{
- if (!ServerInstance->Parser->CreateCommand(f))
+ for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
{
- ModuleException err("Command "+std::string(f->command)+" already exists.");
- throw (err);
+ for (modulelist::iterator x = iter->second.second.begin(); x != iter->second.second.end(); x++)
+ {
+ if (*x == m)
+ {
+ return std::make_pair(iter->second.first, iter->first);
+ }
+ }
}
+ return std::make_pair(0, "");
}
-void Server::SendMode(char **parameters, int pcnt, userrec *user)
+const std::string& InspIRCd::GetModuleName(Module* m)
{
- ServerInstance->ModeGrok->ServerMode(parameters,pcnt,user);
+ static std::string nothing = ""; /* Prevent compiler warning */
+ for (int i = 0; i <= this->GetModuleCount(); i++)
+ {
+ if (this->modules[i] == m)
+ {
+ return this->Config->module_names[i];
+ }
+ }
+ return nothing; /* As above */
}
-void Server::Send(int Socket, const std::string &s)
+void InspIRCd::RehashServer()
{
- Write_NoFormat(Socket,s.c_str());
+ this->WriteOpers("*** Rehashing config file");
+ this->Config->Read(false,NULL);
}
-void Server::SendServ(int Socket, const std::string &s)
+/* This is ugly, yes, but hash_map's arent designed to be
+ * addressed in this manner, and this is a bit of a kludge.
+ * Luckily its a specialist function and rarely used by
+ * many modules (in fact, it was specially created to make
+ * m_safelist possible, initially).
+ */
+
+chanrec* InspIRCd::GetChannelIndex(long index)
{
- WriteServ_NoFormat(Socket,s.c_str());
+ int target = 0;
+ for (chan_hash::iterator n = this->chanlist.begin(); n != this->chanlist.end(); n++, target++)
+ {
+ if (index == target)
+ return n->second;
+ }
+ return NULL;
}
-void Server::SendFrom(int Socket, userrec* User, const std::string &s)
+bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
{
- WriteFrom_NoFormat(Socket,User,s.c_str());
+ return match(sliteral.c_str(),spattern.c_str());
}
-void Server::SendTo(userrec* Source, userrec* Dest, const std::string &s)
+bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
{
- if (!Source)
- {
- // if source is NULL, then the message originates from the local server
- WriteServ_NoFormat(Dest->fd,s.c_str());
- }
- else
- {
- // otherwise it comes from the user specified
- WriteTo_NoFormat(Source,Dest,s.c_str());
- }
+ return this->Parser->CallHandler(commandname,parameters,pcnt,user);
}
-void Server::SendChannelServerNotice(const std::string &ServName, chanrec* Channel, const std::string &text)
+bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
{
- WriteChannelWithServ_NoFormat((char*)ServName.c_str(), Channel, text.c_str());
+ return this->Parser->IsValidCommand(commandname, pcnt, user);
}
-void Server::SendChannel(userrec* User, chanrec* Channel, const std::string &s, bool IncludeSender)
+void InspIRCd::AddCommand(command_t *f)
{
- if (IncludeSender)
- {
- WriteChannel_NoFormat(Channel,User,s.c_str());
- }
- else
+ if (!this->Parser->CreateCommand(f))
{
- ChanExceptSender_NoFormat(Channel,User,0,s.c_str());
+ ModuleException err("Command "+std::string(f->command)+" already exists.");
+ throw (err);
}
}
-bool Server::CommonChannels(userrec* u1, userrec* u2)
+void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user)
{
- return (common_channels(u1,u2) != 0);
+ 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 = "";
{
if (CompleteLine.length() + Word.length() + 3 > 500)
{
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
+ User->WriteServ(CompleteLine);
CompleteLine = LinePrefix;
}
CompleteLine = CompleteLine + Word + " ";
}
- WriteServ_NoFormat(User->fd,CompleteLine.c_str());
+ User->WriteServ(CompleteLine);
}
-void Server::SendCommon(userrec* User, const std::string &text, bool IncludeSender)
+userrec* InspIRCd::FindDescriptor(int socket)
{
- if (IncludeSender)
- {
- WriteCommon_NoFormat(User,text.c_str());
- }
- else
- {
- WriteCommonExcept_NoFormat(User,text.c_str());
- }
+ return reinterpret_cast<userrec*>(this->SE->GetRef(socket));
}
-void Server::SendWallops(userrec* User, const std::string &text)
+bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
{
- WriteWallOps(User,false,"%s",text.c_str());
+ return this->Modes->AddMode(mh,mode);
}
-void Server::ChangeHost(userrec* user, const std::string &host)
+bool InspIRCd::AddModeWatcher(ModeWatcher* mw)
{
- ChangeDisplayedHost(user,host.c_str());
-}
-
-void Server::ChangeGECOS(userrec* user, const std::string &gecos)
-{
- ChangeName(user,gecos.c_str());
-}
-
-bool Server::IsNick(const std::string &nick)
-{
- return (isnick(nick.c_str()) != 0);
-}
-
-userrec* Server::FindNick(const std::string &nick)
-{
- return Find(nick);
-}
-
-userrec* Server::FindDescriptor(int socket)
-{
- return (socket < 65536 ? fd_ref_table[socket] : NULL);
-}
-
-chanrec* Server::FindChannel(const std::string &channel)
-{
- return FindChan(channel.c_str());
-}
-
-std::string Server::ChanMode(userrec* User, chanrec* Chan)
-{
- return cmode(User,Chan);
-}
-
-std::string Server::GetServerName()
-{
- return Config->ServerName;
-}
-
-std::string Server::GetNetworkName()
-{
- return Config->Network;
-}
-
-std::string Server::GetServerDescription()
-{
- return Config->ServerDesc;
-}
-
-Admin Server::GetAdmin()
-{
- return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
-}
-
-
-
-bool Server::AddExtendedMode(char modechar, int type, bool requires_oper, int params_when_on, int params_when_off)
-{
- if (((modechar >= 'A') && (modechar <= 'Z')) || ((modechar >= 'a') && (modechar <= 'z')))
- {
- if (type == MT_SERVER)
- {
- ModuleException e("Modes of type MT_SERVER are reserved for future expansion");
- throw(e);
- return false;
- }
- if (((params_when_on>0) || (params_when_off>0)) && (type == MT_CLIENT))
- {
- ModuleException e("Parameters on MT_CLIENT modes are not supported");
- throw(e);
- return false;
- }
- if ((params_when_on>1) || (params_when_off>1))
- {
- ModuleException e("More than one parameter for an MT_CHANNEL mode is not yet supported");
- throw(e);
- return false;
- }
- return DoAddExtendedMode(modechar,type,requires_oper,params_when_on,params_when_off);
- }
- else
- {
- ModuleException e("Muppet modechar detected.");
- throw(e);
- }
- return false;
+ return this->Modes->AddModeWatcher(mw);
}
-bool Server::AddExtendedListMode(char modechar)
+bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
{
- bool res = DoAddExtendedMode(modechar,MT_CHANNEL,false,1,1);
- if (res)
- ModeMakeList(modechar);
- return res;
+ return this->Modes->DelModeWatcher(mw);
}
-int Server::CountUsers(chanrec* c)
+bool InspIRCd::AddResolver(Resolver* r)
{
- return usercount(c);
+ return this->Res->AddResolverClass(r);
}
-
-bool Server::UserToPseudo(userrec* user, const std::string &message)
+bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
{
- unsigned int old_fd = user->fd;
- Write(old_fd,"ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
+ unsigned int old_fd = user->GetFd();
+ user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
user->FlushWriteBuf();
user->ClearBuffer();
- user->fd = FD_MAGIC_NUMBER;
+ user->SetFd(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);
+ this->SE->DelFd(user);
+ shutdown(old_fd,2);
+ close(old_fd);
return true;
}
-bool Server::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
+bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
{
- log(DEBUG,"PseudoToUser");
- zombie->fd = alive->fd;
- FOREACH_MOD(I_OnUserQuit,OnUserQuit(alive,message));
- alive->fd = FD_MAGIC_NUMBER;
+ zombie->SetFd(alive->GetFd());
+ FOREACH_MOD_I(this,I_OnUserQuit,OnUserQuit(alive,message));
+ alive->SetFd(FD_MAGIC_NUMBER);
alive->FlushWriteBuf();
alive->ClearBuffer();
// save these for later
std::string oldnick = alive->nick;
std::string oldhost = alive->host;
std::string oldident = alive->ident;
- kill_link(alive,message.c_str());
- if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
- {
+ 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
- fd_ref_table[zombie->fd] = zombie;
- Write(zombie->fd,":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
- for (std::vector<ucrec*>::const_iterator i = zombie->chans.begin(); i != zombie->chans.end(); i++)
- {
- if (((ucrec*)(*i))->channel != NULL)
- {
- chanrec* Ptr = ((ucrec*)(*i))->channel;
- WriteFrom(zombie->fd,zombie,"JOIN %s",Ptr->name);
- if (Ptr->topicset)
- {
- WriteServ(zombie->fd,"332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
- WriteServ(zombie->fd,"333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
- }
- userlist(zombie,Ptr);
- WriteServ(zombie->fd,"366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
- }
- }
- if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->fd != FD_MAGIC_NUMBER))
+ zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
+ for (UCListIter i = zombie->chans.begin(); i != zombie->chans.end(); i++)
+ {
+ chanrec* Ptr = i->first;
+ 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);
+ }
+ if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->GetFd() != 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());
+ 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());
+ 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());
+ 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());
+ 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());
+ return XLines->del_eline(hostmask.c_str());
}
-long Server::CalcDuration(const std::string &delta)
-{
- return duration(delta.c_str());
-}
-
-bool Server::IsValidMask(const std::string &mask)
+/*
+ * 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();
- if (strchr(dest,'!')==0)
- return false;
- if (strchr(dest,'@')==0)
- return false;
- for (char* i = dest; *i; i++)
- if (*i < 32)
- return false;
- for (char* i = dest; *i; i++)
- if (*i > 126)
- return false;
- unsigned int c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '!')
- c++;
- if (c>1)
- return false;
- c = 0;
- for (char* i = dest; *i; i++)
- if (*i == '@')
- c++;
- if (c>1)
- return false;
+ if (strchr(dest,'!')==0)
+ return false;
+ if (strchr(dest,'@')==0)
+ return false;
+ for (char* i = dest; *i; i++)
+ if (*i < 32)
+ return false;
+ for (char* i = dest; *i; i++)
+ if (*i > 126)
+ return false;
+ unsigned int c = 0;
+ for (char* i = dest; *i; i++)
+ if (*i == '!')
+ c++;
+ if (c>1)
+ return false;
+ c = 0;
+ for (char* i = dest; *i; i++)
+ if (*i == '@')
+ c++;
+ if (c>1)
+ return false;
return true;
}
-Module* Server::FindModule(const std::string &name)
+Module* InspIRCd::FindModule(const std::string &name)
{
- for (int i = 0; i <= MODCOUNT; i++)
+ for (int i = 0; i <= this->GetModuleCount(); i++)
{
- if (Config->module_names[i] == name)
+ if (this->Config->module_names[i] == name)
{
- return modules[i];
+ return this->modules[i];
}
}
return NULL;
}
-ConfigReader::ConfigReader()
+ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
{
- Config->ClearStack();
- this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->readerror = Config->LoadConf(CONFIG_FILE,this->cache,this->errorlog);
- if (!this->readerror)
- this->error = CONF_FILE_NOT_FOUND;
+ /* Is there any reason to load the entire config file again here?
+ * it's needed if they specify another config file, but using the
+ * default one we can just use the global config data - pre-parsed!
+ */
+ this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
+
+ this->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);
}
-ConfigReader::ConfigReader(const std::string &filename)
+ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
- Config->ClearStack();
- this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
- this->readerror = Config->LoadConf(filename.c_str(),this->cache,this->errorlog);
+ ServerInstance->Config->ClearStack();
+
+ this->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)
{
/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
- char val[MAXBUF];
- int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
- if (!res)
+ std::string result;
+
+ if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return "";
}
- return val;
+
+ return result;
}
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
- /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
- char val[MAXBUF];
- std::string s;
-
- int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
- if (!res)
- {
- this->error = CONF_VALUE_NOT_FOUND;
- return false;
- }
-
- s = val;
-
- return ((s == "yes") || (s == "YES") || (s == "true") || (s == "TRUE") || (s == "1"));
+ return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
}
long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
{
- char val[MAXBUF];
-
- int res = Config->ReadConf(cache, tag.c_str(), name.c_str(), index, val);
- if (!res)
+ int result;
+
+ if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
}
- for (char* i = val; *i; i++)
- {
- if (!isdigit(*i))
- {
- this->error = CONF_NOT_A_NUMBER;
- return 0;
- }
- }
- if ((needs_unsigned) && (atoi(val)<0))
+
+ if ((needs_unsigned) && (result < 0))
{
this->error = CONF_NOT_UNSIGNED;
return 0;
}
- return atoi(val);
+
+ return result;
}
long ConfigReader::GetError()
void ConfigReader::DumpErrors(bool bail, userrec* user)
{
+ /* XXX - Duplicated code */
+
if (bail)
{
- printf("There were errors in your configuration:\n%s",errorlog->str().c_str());
- exit(0);
+ printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
+ InspIRCd::Exit(ERROR);
}
else
{
- char dataline[1024];
+ 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)
{
- WriteServ(user->fd,"NOTICE %s :There were errors in the configuration file:",user->nick);
-
- while (!errorlog->eof())
+ user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
+
+ while(start < errors.length())
{
- errorlog->getline(dataline,1024);
- WriteServ(user->fd,"NOTICE %s :%s",user->nick,dataline);
+ user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
+ start += 510 - prefixlen;
}
}
else
{
- WriteOpers("There were errors in the configuration file:",user->nick);
+ ServerInstance->WriteOpers("There were errors in the configuration file:");
- while (!errorlog->eof())
+ while(start < errors.length())
{
- errorlog->getline(dataline,1024);
- WriteOpers(dataline);
+ ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
+ start += 360;
}
}
-
+
return;
}
}
int ConfigReader::Enumerate(const std::string &tag)
{
- return Config->EnumConf(cache,tag.c_str());
+ return ServerInstance->Config->ConfValueEnum(*this->data, tag);
}
int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
- return Config->EnumValues(cache, tag.c_str(), index);
+ return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
}
bool ConfigReader::Verify()
}
-FileReader::FileReader(const std::string &filename)
+FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
file_cache c;
- readfile(c,filename.c_str());
+ ServerInstance->Config->ReadFile(c,filename.c_str());
this->fc = c;
+ this->CalcSize();
}
-FileReader::FileReader()
+FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
{
}
+std::string FileReader::Contents()
+{
+ std::string x = "";
+ for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
+ {
+ x.append(*a);
+ x.append("\r\n");
+ }
+ return x;
+}
+
+unsigned long FileReader::ContentSize()
+{
+ return this->contentsize;
+}
+
+void FileReader::CalcSize()
+{
+ unsigned long n = 0;
+ for (file_cache::iterator a = this->fc.begin(); a != this->fc.end(); a++)
+ n += (a->length() + 2);
+ this->contentsize = n;
+}
+
void FileReader::LoadFile(const std::string &filename)
{
file_cache c;
- readfile(c,filename.c_str());
+ ServerInstance->Config->ReadFile(c,filename.c_str());
this->fc = c;
+ this->CalcSize();
}
}
-std::vector<Module*> modules(255);
-std::vector<ircd_module*> factory(255);
-
-int MODCOUNT = -1;
projects / user / henk / code / inspircd.git / blobdiff