* ---------------------------------------------------
*/
+/* $Core: libIRCDmodules */
+
#include "inspircd.h"
#include "wildcard.h"
#include "xline.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::OnAddGLine(long, User*, const std::string&, const std::string&) { }
+void Module::OnAddZLine(long, User*, const std::string&, const std::string&) { }
+void Module::OnAddKLine(long, User*, const std::string&, const std::string&) { }
+void Module::OnAddQLine(long, User*, const std::string&, const std::string&) { }
+void Module::OnAddELine(long, User*, const std::string&, const std::string&) { }
+void Module::OnDelGLine(User*, const std::string&) { }
+void Module::OnDelZLine(User*, const std::string&) { }
+void Module::OnDelKLine(User*, const std::string&) { }
+void Module::OnDelQLine(User*, const std::string&) { }
+void Module::OnDelELine(User*, const std::string&) { }
+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*) { }
ModuleManager::ModuleManager(InspIRCd* Ins)
{
ModuleHandleList::iterator iter;
- if((j < 0) || (j >= handles.size()))
+ if (j >= handles.size())
{
return false;
}
{
bool success = false;
- {
- ModuleList::iterator iter;
-
- if((j < 0) || (j >= modules.size()))
- {
- return false;
- }
+ ModuleList::iterator iter;
- iter = modules.begin() + j;
+ if (j >= modules.size())
+ {
+ return false;
+ }
- if(*iter)
- {
- delete *iter;
- modules.erase(iter);
- modules.push_back(NULL);
- success = true;
- }
+ 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())
{
- 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 false;
}
+ iter2 = Instance->Config->module_names.begin() + j;
+
+ Instance->Config->module_names.erase(iter2);
+ success = true;
+
return success;
}
Instance->Exit(EXIT_STATUS_MODULE);
}
}
- printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->GetCount(), this->GetCount() == 1 ? " has" : "s have");
- Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount());
+ 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 ModuleManager::PriorityAfter(const std::string &modulename)
* 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)
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++)
- {
- /* 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* ModuleManager::Find(const std::string &name)
{
for (int i = 0; i <= this->GetCount(); 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;
}
{
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);
return olderr;
}
-void ConfigReader::DumpErrors(bool bail, userrec* user)
+void ConfigReader::DumpErrors(bool bail, User* user)
{
ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
}