diff options
Diffstat (limited to 'src/modules')
36 files changed, 209 insertions, 179 deletions
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp index 93d763cb5..bc72e0e0c 100644 --- a/src/modules/extra/m_sqlauth.cpp +++ b/src/modules/extra/m_sqlauth.cpp @@ -130,7 +130,7 @@ public: log(DEBUG, "SQLrequest failed: %s", req.error.Str()); if (verbose) - WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str()); + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, req.error.Str()); return false; } @@ -170,14 +170,14 @@ public: else if (verbose) { /* No rows in result, this means there was no record matching the user */ - WriteOpers("Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host); + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick, user->ident, user->host); user->Extend("sqlauth_failed"); } } else if (verbose) { log(DEBUG, "Query failed: %s", res->error.Str()); - WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str()); + ServerInstance->WriteOpers("Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str()); user->Extend("sqlauth_failed"); } } diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 2ec6085fc..9d48b1034 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -25,6 +25,8 @@ using namespace std; /* $ModDesc: Provides aliases of commands. */ +extern InspIRCd* ServerInstance; + class Alias : public classbase { public: @@ -106,7 +108,7 @@ class ModuleAlias : public Module { if (Aliases[i].requires != "") { - u = Srv->FindNick(Aliases[i].requires); + u = ServerInstance->FindNick(Aliases[i].requires); if (!u) { user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later."); @@ -117,7 +119,7 @@ class ModuleAlias : public Module { if (!Srv->IsUlined(u->server)) { - Srv->SendOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); + ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible."); return 1; } diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 9567f2de7..b22b5b327 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -140,7 +140,7 @@ public: { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - WriteOpers("*** %s had an /amsg or /ame denied", user->nick); + ServerInstance->WriteOpers("*** %s had an /amsg or /ame denied", user->nick); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) userrec::QuitUser(ServerInstance, user, "Global message (/amsg or /ame) detected"); diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index eb971864b..e4fa5d91b 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -28,6 +28,8 @@ /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ +extern InspIRCd* ServerInstance; + class CBan : public classbase { public: @@ -109,12 +111,12 @@ class cmd_cban : public command_t if(length > 0) { user->WriteServ( "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); - WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); } else { user->WriteServ( "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str()); - WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); + ServerInstance->WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); } } else @@ -170,7 +172,7 @@ class ModuleCBan : public Module { // Channel is banned. user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); - WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); + ServerInstance->WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); return 1; } } @@ -245,7 +247,7 @@ void ExpireBans() if (iter->set_on + iter->length <= TIME) { log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); - WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); + ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); cbans.erase(iter); go_again = true; } diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp index 31b5dc092..7bb46b753 100644 --- a/src/modules/m_cgiirc.cpp +++ b/src/modules/m_cgiirc.cpp @@ -63,7 +63,7 @@ class CGIResolver : public Resolver if ((them) && (them == ServerInstance->fd_ref_table[theirfd])) { if (notify) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str()); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str()); strlcpy(them->host, result.c_str(), 63); strlcpy(them->dhost, result.c_str(), 63); @@ -76,7 +76,7 @@ class CGIResolver : public Resolver if ((them) && (them == ServerInstance->fd_ref_table[theirfd])) { if (notify) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str()); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str()); } } @@ -253,7 +253,7 @@ public: log(DEBUG, "m_cgiirc.so: Got an IP in the user's password"); if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password); } else { @@ -268,14 +268,14 @@ public: catch (ModuleException& e) { if (NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } } *user->password = 0; /*if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/ return true; } @@ -328,7 +328,7 @@ public: strlcpy(user->ident, "~cgiirc", 8); if(NotifyOpers) - WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); + ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host); } /*strlcpy(user->host, newip, 16); strlcpy(user->dhost, newip, 16); diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 53e725504..41b78f98b 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -22,6 +22,8 @@ /* $ModDesc: Provides channel modes +a and +q */ +extern InspIRCd* ServerInstance; + const char* fakevalue = "on"; class ChanFounder : public ModeHandler @@ -34,7 +36,7 @@ class ChanFounder : public ModeHandler ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) { - userrec* x = Find(parameter); + userrec* x = ServerInstance->FindNick(parameter); if (x) { if (!channel->HasUser(x)) @@ -60,7 +62,7 @@ class ChanFounder : public ModeHandler ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - userrec* theuser = Srv->FindNick(parameter); + userrec* theuser = ServerInstance->FindNick(parameter); log(DEBUG,"ChanFounder::OnModeChange"); @@ -149,7 +151,7 @@ class ChanProtect : public ModeHandler ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) { - userrec* x = Find(parameter); + userrec* x = ServerInstance->FindNick(parameter); if (x) { if (!channel->HasUser(x)) @@ -174,7 +176,7 @@ class ChanProtect : public ModeHandler ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - userrec* theuser = Srv->FindNick(parameter); + userrec* theuser = ServerInstance->FindNick(parameter); // cant find the user given as the parameter, eat the mode change. if (!theuser) diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp index 7dcb86d38..f8d84154e 100644 --- a/src/modules/m_check.cpp +++ b/src/modules/m_check.cpp @@ -53,8 +53,8 @@ class cmd_check : public command_t checkstr = "304 " + std::string(user->nick) + " :CHECK"; - targuser = Srv->FindNick(std::string(parameters[0])); - targchan = Srv->FindChannel(std::string(parameters[0])); + targuser = ServerInstance->FindNick(parameters[0]); + targchan = ServerInstance->FindChan(parameters[0]); /* * Syntax of a /check reply: @@ -114,7 +114,7 @@ class cmd_check : public command_t user->WriteServ(checkstr + " topic_setat " + timebuf); } - user->WriteServ(checkstr + " modes " + chanmodes(targchan, true)); + user->WriteServ(checkstr + " modes " + targchan->ChanModes(true)); user->WriteServ(checkstr + " membercount " + ConvToStr(targchan->GetUserCounter())); /* now the ugly bit, spool current members of a channel. :| */ diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 23a482a65..fc5507822 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -22,10 +22,12 @@ using namespace std; #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for the CHGHOST command */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_chghost : public command_t { @@ -56,13 +58,13 @@ class cmd_chghost : public command_t user->WriteServ("NOTICE %s :*** CHGHOST: Host too long",user->nick); return; } - userrec* dest = Srv->FindNick(std::string(parameters[0])); + userrec* dest = ServerInstance->FindNick(parameters[0]); if (dest) { if ((dest->ChangeDisplayedHost(parameters[1])) && (!Srv->IsUlined(user->server))) { // fix by brain - ulines set hosts silently - Srv->SendOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+std::string(dest->nick)+" become "+std::string(parameters[1])); + ServerInstance->WriteOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+parameters[1]); } } } diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp index 7cb09127a..391f4b20b 100644 --- a/src/modules/m_chgident.cpp +++ b/src/modules/m_chgident.cpp @@ -3,9 +3,12 @@ #include "modules.h" #include "message.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for the CHGIDENT command */ +extern InspIRCd* ServerInstance; + class cmd_chgident : public command_t { Server* Srv; @@ -19,8 +22,8 @@ class cmd_chgident : public command_t void Handle(const char** parameters, int pcnt, userrec *user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - + userrec* dest = ServerInstance->FindNick(parameters[0]); + if(dest) { if(!isident(parameters[1])) @@ -29,7 +32,7 @@ class cmd_chgident : public command_t return; } - WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]); + ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]); strlcpy(dest->ident, parameters[1], IDENTMAX+2); } else diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp index b1a9d8c7c..85ea0a84d 100644 --- a/src/modules/m_connflood.cpp +++ b/src/modules/m_connflood.cpp @@ -95,7 +95,7 @@ public: { /* expire throttle */ throttled = 0; - Srv->SendOpers("*** Connection throttle deactivated"); + ServerInstance->WriteOpers("*** Connection throttle deactivated"); return; } userrec::QuitUser(ServerInstance, user, quitmsg); @@ -107,7 +107,7 @@ public: if (conns >= maxconns) { throttled = 1; - Srv->SendOpers("*** Connection throttle activated"); + ServerInstance->WriteOpers("*** Connection throttle activated"); userrec::QuitUser(ServerInstance, user, quitmsg); return; } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index 0f9477921..13e68f943 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -107,11 +107,8 @@ class ModuleFilter : public Module if (f->action == "block") { - Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+ - std::string(" had their notice filtered, target was ")+ - target+": "+f->reason); - user->WriteServ("NOTICE "+std::string(user->nick)+ - " :Your notice has been filtered and opers notified: "+f->reason); + ServerInstance->WriteOpers(std::string("FILTER: ")+user->nick+" had their notice filtered, target was "+target+": "+f->reason); + user->WriteServ("NOTICE "+std::string(user->nick)+" :Your notice has been filtered and opers notified: "+f->reason); } Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+ std::string(" had their notice filtered, target was ")+ diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index ca5bdda7e..8e68d48a6 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -40,7 +40,7 @@ class cmd_gloadmodule : public command_t { if (ServerInstance->LoadModule(parameters[0])) { - WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick); + ServerInstance->WriteOpers("*** NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0],user->nick); user->WriteServ("975 %s %s :Module successfully loaded.",user->nick, parameters[0]); } else @@ -63,7 +63,7 @@ class cmd_gunloadmodule : public command_t { if (ServerInstance->UnloadModule(parameters[0])) { - WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick); + ServerInstance->WriteOpers("*** MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0],user->nick); user->WriteServ("973 %s %s :Module successfully unloaded.",user->nick, parameters[0]); } else diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index fa4f27f04..a8f66b6a7 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -145,7 +145,7 @@ class ModuleHttpStats : public Module int n = 0; for (SortedIter a = so->begin(); ((a != so->end()) && (n < 25)); a++, n++) { - chanrec* c = Srv->FindChannel(a->second.c_str()); + chanrec* c = ServerInstance->FindChan(a->second.c_str()); if (c) { data << "<tr><td>" << a->first << "</td><td>" << a->second << "</td>"; diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 8f040cd38..e681f02d6 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -27,6 +27,7 @@ using namespace std; /* $ModDesc: Provides support for /KNOCK and mode +K */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_knock : public command_t { @@ -39,7 +40,7 @@ class cmd_knock : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - chanrec* c = Srv->FindChannel(parameters[0]); + chanrec* c = ServerInstance->FindChan(parameters[0]); if (!c) { diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index e46b56901..58a4c2686 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -23,6 +23,7 @@ using namespace std; #include "modules.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "inspircd.h" /* $ModDesc: Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit */ @@ -41,7 +42,7 @@ class cmd_nicklock : public command_t void Handle(const char** parameters, int pcnt, userrec *user) { - userrec* source = Srv->FindNick(std::string(parameters[0])); + userrec* source = ServerInstance->FindNick(parameters[0]); irc::string server; irc::string me; @@ -55,7 +56,7 @@ class cmd_nicklock : public command_t if (Srv->IsNick(std::string(parameters[1]))) { // give them a lock flag - Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]); + ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]); if (!source->ForceNickChange(parameters[1])) { userrec::QuitUser(ServerInstance, source, "Nickname collision"); @@ -78,12 +79,12 @@ class cmd_nickunlock : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* source = Srv->FindNick(std::string(parameters[0])); + userrec* source = ServerInstance->FindNick(parameters[0]); if (source) { source->Shrink("nick_locked"); user->WriteServ("945 %s %s :Nickname now unlocked.",user->nick,source->nick); - Srv->SendOpers(std::string(user->nick)+" used NICKUNLOCK on "+std::string(parameters[0])); + ServerInstance->WriteOpers(std::string(user->nick)+" used NICKUNLOCK on "+parameters[0]); } } }; diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp index cc248718f..0c97765b9 100644 --- a/src/modules/m_operlevels.cpp +++ b/src/modules/m_operlevels.cpp @@ -9,6 +9,8 @@ using namespace std; /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */ +extern InspIRCd* ServerInstance; + class ModuleOperLevels : public Module { @@ -74,7 +76,7 @@ class ModuleOperLevels : public Module } if (dest_level > source_level) { - WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str()); + ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str()); dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick); source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick); return 1; diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index c16a2125f..4f188b0cb 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -22,6 +22,8 @@ /* $ModDesc: Provides support for unreal-style oper-override */ +extern InspIRCd* ServerInstance; + typedef std::map<std::string,std::string> override_t; class ModuleOverride : public Module @@ -93,7 +95,7 @@ class ModuleOverride : public Module { if (((Srv->ChanMode(source,chan) == "%") && (Srv->ChanMode(user,chan) == "@")) || (Srv->ChanMode(source,chan) == "")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Kicked "+std::string(user->nick)+" on "+std::string(chan->name)+" ("+reason+")"); } /* Returning -1 explicitly allows the kick */ return -1; @@ -117,7 +119,7 @@ class ModuleOverride : public Module case AC_DEOP: if (CanOverride(source,"MODEDEOP")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Deopped "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -128,7 +130,7 @@ class ModuleOverride : public Module case AC_OP: if (CanOverride(source,"MODEOP")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Opped "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -139,7 +141,7 @@ class ModuleOverride : public Module case AC_VOICE: if (CanOverride(source,"MODEVOICE")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Voiced "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -150,7 +152,7 @@ class ModuleOverride : public Module case AC_DEVOICE: if (CanOverride(source,"MODEDEVOICE")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Devoiced "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -161,7 +163,7 @@ class ModuleOverride : public Module case AC_HALFOP: if (CanOverride(source,"MODEHALFOP")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Halfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -172,7 +174,7 @@ class ModuleOverride : public Module case AC_DEHALFOP: if (CanOverride(source,"MODEDEHALFOP")) { - Srv->SendOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); + ServerInstance->WriteOpers("*** NOTICE: "+std::string(source->nick)+" Override-Dehalfopped "+std::string(dest->nick)+" on "+std::string(channel->name)); return ACR_ALLOW; } else @@ -213,7 +215,7 @@ class ModuleOverride : public Module chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s invited himself into the channel", cname, user->nick); } } - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); + ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname)); return -1; } @@ -221,7 +223,7 @@ class ModuleOverride : public Module { if (NoisyOverride) chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s bypassed the channel key", cname, user->nick); - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname)); + ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname)); return -1; } @@ -229,7 +231,7 @@ class ModuleOverride : public Module { if (NoisyOverride) chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s passed through your channel limit", cname, user->nick); - Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname)); + ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname)); return -1; } diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp index 8502fbfdb..3629e9b48 100644 --- a/src/modules/m_park.cpp +++ b/src/modules/m_park.cpp @@ -146,7 +146,7 @@ class cmd_unpark : public command_t * * And there you have it, easy huh (NOT)... */ - userrec* unpark = Srv->FindNick(std::string(parameters[0])); + userrec* unpark = ServerInstance->FindNick(parameters[0]); if (!unpark) { user->WriteServ("942 %s %s :Invalid user specified.",user->nick, parameters[0]); @@ -322,7 +322,7 @@ class ModulePark : public Module { if (time(NULL) >= (j->parktime+ParkMaxTime)) { - userrec* thisnick = Srv->FindNick(j->nick); + userrec* thisnick = ServerInstance->FindNick(j->nick); // THIS MUST COME BEFORE THE QuitUser - QuitUser can // create a recursive call to OnUserQuit in this module // and then corrupt the pointer! diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 4d8d717ab..c143cab52 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -60,7 +60,7 @@ class Redirect : public ModeHandler return MODEACTION_DENY; } - c = Srv->FindChannel(parameter); + c = ServerInstance->FindChan(parameter); if (c) { /* Fix by brain: Dont let a channel be linked to *itself* either */ diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index a5657f604..587edac86 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -17,6 +17,8 @@ * eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes. */ +extern InspIRCd* ServerInstance; + class RemoveBase { private: @@ -85,10 +87,10 @@ class RemoveBase username = parameters[ neworder ? 1 : 0]; /* Look up the user we're meant to be removing from the channel */ - target = Srv->FindNick(username); + target = ServerInstance->FindNick(username); /* And the channel we're meant to be removing them from */ - channel = Srv->FindChannel(channame); + channel = ServerInstance->FindChan(channame); /* Fix by brain - someone needs to learn to validate their input! */ if (!target || !channel) diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp index 000d1e7d6..2aa5a02f6 100644 --- a/src/modules/m_safelist.cpp +++ b/src/modules/m_safelist.cpp @@ -107,7 +107,7 @@ class ListTimer : public InspTimer long users = chan->GetUserCounter(); if (users) { - int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic); + int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chan->ChanModes(has_user),chan->topic); /* Increment total plus linefeed */ amount_sent += counter + 4 + Srv->GetServerName().length(); log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax); diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index af03f47d7..65babdfa4 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -40,7 +40,7 @@ class cmd_sajoin : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); + userrec* dest = ServerInstance->FindNick(parameters[0]); if (dest) { if (Srv->IsUlined(dest->server)) @@ -55,7 +55,7 @@ class cmd_sajoin : public command_t return; } - Srv->SendOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); + ServerInstance->WriteOpers(std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]); chanrec::JoinUser(ServerInstance, dest, parameters[1], true); } } diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 012bfed89..104e5da33 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -68,7 +68,7 @@ class cmd_samode : public command_t result.append(" "); result.append(parameters[n]); } - Srv->SendOpers(result); + ServerInstance->WriteOpers(result); } }; diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp index db35b9ba5..a323844d5 100644 --- a/src/modules/m_sanick.cpp +++ b/src/modules/m_sanick.cpp @@ -39,7 +39,7 @@ class cmd_sanick : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* source = Srv->FindNick(std::string(parameters[0])); + userrec* source = ServerInstance->FindNick(parameters[0]); if (source) { if (Srv->IsUlined(source->server)) @@ -51,7 +51,7 @@ class cmd_sanick : public command_t { // FIX by brain: Cant use source->nick here because if it traverses a server link then // source->nick becomes invalid as the object data moves in memory. - Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]); + ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]); if (!source->ForceNickChange(parameters[1])) { /* We couldnt change the nick */ diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 4493a178f..fb4117b42 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -27,6 +27,7 @@ using namespace std; /* $ModDesc: Provides support for unreal-style SAPART command */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_sapart : public command_t { @@ -39,8 +40,8 @@ class cmd_sapart : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* dest = Srv->FindNick(parameters[0]); - chanrec* channel = Srv->FindChannel(parameters[1]); + userrec* dest = ServerInstance->FindNick(parameters[0]); + chanrec* channel = ServerInstance->FindChan(parameters[1]); if (dest && channel) { if (Srv->IsUlined(dest->server)) @@ -48,7 +49,7 @@ class cmd_sapart : public command_t user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick); return; } - Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); + ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); if (!channel->PartUser(dest, dest->nick)) delete channel; } diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp index dd02d4e41..4900a3db8 100644 --- a/src/modules/m_saquit.cpp +++ b/src/modules/m_saquit.cpp @@ -49,7 +49,7 @@ class cmd_saquit : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); + userrec* dest = ServerInstance->FindNick(parameters[0]); if (dest) { if (Srv->IsUlined(dest->server)) @@ -64,7 +64,7 @@ class cmd_saquit : public command_t } line = line + std::string(parameters[pcnt-1]); - Srv->SendOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line); + ServerInstance->WriteOpers(std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line); userrec::QuitUser(ServerInstance, dest, line); } } diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 631bd13a1..697ba1dfd 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -22,10 +22,12 @@ using namespace std; #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for the SETHOST command */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_sethost : public command_t { @@ -55,7 +57,7 @@ class cmd_sethost : public command_t } } if (user->ChangeDisplayedHost(parameters[0])) - Srv->SendOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0])); + ServerInstance->WriteOpers(std::string(user->nick)+" used SETHOST to change their displayed host to "+std::string(parameters[0])); } }; diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp index a5eb27a9b..b3bcef53b 100644 --- a/src/modules/m_setident.cpp +++ b/src/modules/m_setident.cpp @@ -1,10 +1,12 @@ #include "users.h" #include "modules.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for the SETIDENT command */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_setident : public command_t { @@ -26,7 +28,7 @@ class cmd_setident : public command_t return; } - WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]); + ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]); strlcpy(user->ident, parameters[0], IDENTMAX+2); } }; diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp index f17f69e09..c83c7e7e0 100644 --- a/src/modules/m_setidle.cpp +++ b/src/modules/m_setidle.cpp @@ -22,10 +22,12 @@ using namespace std; #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Allows opers to set their idle time */ static Server *Srv = NULL; +extern InspIRCd* ServerInstance; class cmd_setidle : public command_t { @@ -47,7 +49,7 @@ class cmd_setidle : public command_t // minor tweak - we cant have signon time shorter than our idle time! if (user->signon > user->idle_lastmsg) user->signon = user->idle_lastmsg; - Srv->SendOpers(std::string(user->nick)+" used SETIDLE to set their idle time to "+std::string(parameters[0])+" seconds"); + ServerInstance->WriteOpers(std::string(user->nick)+" used SETIDLE to set their idle time to "+std::string(parameters[0])+" seconds"); user->WriteServ("944 %s :Idle time set.",user->nick); } }; diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index 72ae322f6..21209ab6a 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -617,7 +617,7 @@ class cmd_rconnect : public command_t if (Srv->MatchText(Srv->GetServerName(),parameters[0])) { /* Yes, initiate the given connect */ - WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); + ServerInstance->WriteOpers("*** Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]); const char* para[1]; para[0] = parameters[1]; Creator->OnPreCommand("CONNECT", para, 1, user, true); @@ -713,12 +713,12 @@ class TreeSocket : public InspSocket keylength = key.length(); if (!(keylength == 16 || keylength == 24 || keylength == 32)) { - WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); + ServerInstance->WriteOpers("*** \2ERROR\2: Key length for encryptionkey is not 16, 24 or 32 bytes in length!"); log(DEBUG,"Key length not 16, 24 or 32 characters!"); } else { - WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); + ServerInstance->WriteOpers("*** \2AES\2: Initialized %d bit encryption to server %s",keylength*8,SName.c_str()); ctx_in->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", keylength, keylength); ctx_out->MakeKey(key.c_str(), "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ @@ -741,13 +741,13 @@ class TreeSocket : public InspSocket { if (x->Name == this->myhost) { - Srv->SendOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established."); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established."); this->SendCapabilities(); if (x->EncryptionKey != "") { if (!(x->EncryptionKey.length() == 16 || x->EncryptionKey.length() == 24 || x->EncryptionKey.length() == 32)) { - WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); + ServerInstance->WriteOpers("\2WARNING\2: Your encryption key is NOT 16, 24 or 32 characters in length, encryption will \2NOT\2 be enabled."); } else { @@ -766,7 +766,7 @@ class TreeSocket : public InspSocket * If that happens the connection hangs here until it's closed. Unlikely * and rather harmless. */ - Srv->SendOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); + ServerInstance->WriteOpers("*** Connection to \2"+myhost+"\2 lost link tag(!)"); return true; } @@ -778,7 +778,7 @@ class TreeSocket : public InspSocket */ if (e == I_ERR_CONNECT) { - Srv->SendOpers("*** Connection failed: Connection refused"); + ServerInstance->WriteOpers("*** Connection failed: Connection refused"); } } @@ -857,10 +857,10 @@ class TreeSocket : public InspSocket quitserver = this->InboundServerName; } - WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); - WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); - WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); - WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again."); + ServerInstance->WriteOpers("*** \2ERROR\2: Server '%s' does not have the same set of modules loaded, cannot link!",quitserver.c_str()); + ServerInstance->WriteOpers("*** Our networked module set is: '%s'",this->MyCapabilities().c_str()); + ServerInstance->WriteOpers("*** Other server's networked module set is: '%s'",params[0].c_str()); + ServerInstance->WriteOpers("*** These lists must match exactly on both servers. Please correct these errors, and try again."); this->WriteLine("ERROR :CAPAB mismatch; My capabilities: '"+this->MyCapabilities()+"'"); return false; } @@ -904,11 +904,11 @@ class TreeSocket : public InspSocket DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName()); if (Current->GetParent() == TreeRoot) { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split: "+reason); } else { - Srv->SendOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); + ServerInstance->WriteOpers("Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason); } num_lost_servers = 0; num_lost_users = 0; @@ -917,7 +917,7 @@ class TreeSocket : public InspSocket Current->Tidy(); Current->GetParent()->DelChild(Current); DELETE(Current); - WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); + ServerInstance->WriteOpers("Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers); } else { @@ -939,7 +939,7 @@ class TreeSocket : public InspSocket std::string sourceserv; /* Are we dealing with an FMODE from a user, or from a server? */ - userrec* who = Srv->FindNick(source); + userrec* who = ServerInstance->FindNick(source); if (who) { /* FMODE from a user, set sourceserv to the users server name */ @@ -975,7 +975,7 @@ class TreeSocket : public InspSocket } /* Extract the TS value of the object, either userrec or chanrec */ - userrec* dst = Srv->FindNick(params[0]); + userrec* dst = ServerInstance->FindNick(params[0]); chanrec* chan = NULL; time_t ourTS = 0; if (dst) @@ -984,7 +984,7 @@ class TreeSocket : public InspSocket } else { - chan = Srv->FindChannel(params[0]); + chan = ServerInstance->FindChan(params[0]); if (chan) { ourTS = chan->age; @@ -1291,7 +1291,7 @@ class TreeSocket : public InspSocket */ if ((Srv->IsUlined(sourceserv)) && (TS > ourTS)) { - WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str()); + ServerInstance->WriteOpers("\2WARNING!\2 U-Lined server '%s' has bad TS for '%s' (accepted change): \2SYNC YOUR CLOCKS\2 to avoid this notice",sourceserv.c_str(),params[0].c_str()); } /* Allow the mode, route it to either server or user command handling */ if (smode) @@ -1317,7 +1317,7 @@ class TreeSocket : public InspSocket time_t ts = atoi(params[1].c_str()); std::string nsource = source; - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { if ((ts >= c->topicset) || (!*c->topic)) @@ -1332,7 +1332,7 @@ class TreeSocket : public InspSocket */ if (oldtopic != params[3]) { - userrec* user = Srv->FindNick(source); + userrec* user = ServerInstance->FindNick(source); if (!user) { c->WriteChannelWithServ(source.c_str(), "TOPIC %s :%s", c->name, c->topic); @@ -1373,7 +1373,7 @@ class TreeSocket : public InspSocket time_t TS = atoi(params[1].c_str()); char* key = ""; - chanrec* chan = Srv->FindChannel(channel); + chanrec* chan = ServerInstance->FindChan(channel); if (chan) { key = chan->key; @@ -1384,7 +1384,7 @@ class TreeSocket : public InspSocket * channel will let the other side apply their modes. */ time_t ourTS = time(NULL)+600; - chanrec* us = Srv->FindChannel(channel); + chanrec* us = ServerInstance->FindChan(channel); if (us) { ourTS = us->age; @@ -1424,7 +1424,7 @@ class TreeSocket : public InspSocket strlcat(modestring,"v",MAXBUF); break; } - who = Srv->FindNick(usr); + who = ServerInstance->FindNick(usr); if (who) { chanrec::JoinUser(this->Instance, who, channel.c_str(), true, key); @@ -1509,7 +1509,7 @@ class TreeSocket : public InspSocket { if (params.size() >= 2) { - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { time_t theirTS = atoi(params[1].c_str()); @@ -1577,7 +1577,7 @@ class TreeSocket : public InspSocket else _new->SetSockAddr(AF_INET, params[6].c_str(), 0); - WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString()); + ServerInstance->WriteOpers("*** Client connecting at %s: %s!%s@%s [%s]",_new->server,_new->nick,_new->ident,_new->host, _new->GetIPString()); params[7] = ":" + params[7]; DoOneToAllButSender(source,"NICK",params,source); @@ -1693,7 +1693,7 @@ class TreeSocket : public InspSocket } /* XXX: Send each channel mode and its params -- we'll need a method for this in ModeHandler? */ //FOREACH_MOD(I_OnSyncChannel,OnSyncChannel(c->second,(Module*)TreeProtocolModule,(void*)this)); - this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+chanmodes(c,true)+modes+" "+params); + this->WriteLine(":"+Srv->GetServerName()+" FMODE "+c->name+" "+ConvToStr(c->age)+" +"+c->ChanModes(true)+modes+" "+params); } /* Send G, Q, Z and E lines */ @@ -1814,7 +1814,7 @@ class TreeSocket : public InspSocket std::string endburst = "ENDBURST"; // Because by the end of the netburst, it could be gone! std::string name = s->GetName(); - Srv->SendOpers("*** Bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2."); this->WriteLine(burst); /* send our version string */ this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion()); @@ -1827,7 +1827,7 @@ class TreeSocket : public InspSocket this->SendXLines(s); FOREACH_MOD(I_OnSyncOtherMetaData,OnSyncOtherMetaData((Module*)TreeProtocolModule,(void*)this)); this->WriteLine(endburst); - Srv->SendOpers("*** Finished bursting to \2"+name+"\2."); + ServerInstance->WriteOpers("*** Finished bursting to \2"+name+"\2."); } /* This function is called when we receive data from a remote @@ -1923,7 +1923,7 @@ class TreeSocket : public InspSocket { if (params.size() < 1) return false; - WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); + ServerInstance->WriteOpers("*** ERROR from %s: %s",(InboundServerName != "" ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str()); /* we will return false to cause the socket to close. */ return false; } @@ -1939,7 +1939,7 @@ class TreeSocket : public InspSocket { /* It's for our server */ string_list results; - userrec* source = Srv->FindNick(prefix); + userrec* source = ServerInstance->FindNick(prefix); if (source) { std::deque<std::string> par; @@ -1956,7 +1956,7 @@ class TreeSocket : public InspSocket else { /* Pass it on */ - userrec* source = Srv->FindNick(prefix); + userrec* source = ServerInstance->FindNick(prefix); if (source) DoOneToOne(prefix, "STATS", params, params[1]); } @@ -1976,7 +1976,7 @@ class TreeSocket : public InspSocket return true; } std::string opertype = params[0]; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { u->modes[UM_OPERATOR] = 1; @@ -1994,7 +1994,7 @@ class TreeSocket : public InspSocket if (params.size() < 3) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { @@ -2022,7 +2022,7 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { @@ -2041,7 +2041,7 @@ class TreeSocket : public InspSocket if (Srv->MatchText(Srv->GetServerName(),servermask)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002"+prefix+"\002."); Srv->RehashServer(); ReadConfiguration(false); } @@ -2055,8 +2055,8 @@ class TreeSocket : public InspSocket return true; std::string nick = params[0]; - userrec* u = Srv->FindNick(prefix); - userrec* who = Srv->FindNick(nick); + userrec* u = ServerInstance->FindNick(prefix); + userrec* who = ServerInstance->FindNick(nick); if (who) { @@ -2103,7 +2103,7 @@ class TreeSocket : public InspSocket * dump the PONG reply back to their fd. If its a server, do nowt. * Services might want to send these s->s, but we dont need to yet. */ - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -2135,7 +2135,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) == '#') { - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_CHANNEL,c,params[1],params[2])); @@ -2143,7 +2143,7 @@ class TreeSocket : public InspSocket } else if (*(params[0].c_str()) != '#') { - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (u) { FOREACH_MOD(I_OnDecodeMetaData,OnDecodeMetaData(TYPE_USER,u,params[1],params[2])); @@ -2177,7 +2177,7 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -2217,7 +2217,7 @@ class TreeSocket : public InspSocket break; default: /* Just in case... */ - Srv->SendOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); + ServerInstance->WriteOpers("*** \2WARNING\2: Invalid xline type '"+params[0]+"' sent by server "+prefix+", ignored!"); propogate = false; break; } @@ -2227,11 +2227,11 @@ class TreeSocket : public InspSocket { if (atoi(params[4].c_str())) { - WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str()); + ServerInstance->WriteOpers("*** %s Added %cLINE on %s to expire in %lu seconds (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),atoi(params[4].c_str()),params[5].c_str()); } else { - WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str()); + ServerInstance->WriteOpers("*** %s Added permenant %cLINE on %s (%s).",prefix.c_str(),*(params[0].c_str()),params[1].c_str(),params[5].c_str()); } params[5] = ":" + params[5]; DoOneToAllButSender(prefix,"ADDLINE",params,prefix); @@ -2249,7 +2249,7 @@ class TreeSocket : public InspSocket if (params.size() < 1) return true; - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -2266,7 +2266,7 @@ class TreeSocket : public InspSocket return true; log(DEBUG,"In IDLE command"); - userrec* u = Srv->FindNick(prefix); + userrec* u = ServerInstance->FindNick(prefix); if (u) { @@ -2274,10 +2274,10 @@ class TreeSocket : public InspSocket // an incoming request if (params.size() == 1) { - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); if ((x) && (IS_LOCAL(x))) { - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); log(DEBUG,"Got IDLE"); char signon[MAXBUF]; char idle[MAXBUF]; @@ -2300,7 +2300,7 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { std::string who_did_the_whois = params[0]; - userrec* who_to_send_to = Srv->FindNick(who_did_the_whois); + userrec* who_to_send_to = ServerInstance->FindNick(who_did_the_whois); if ((who_to_send_to) && (IS_LOCAL(who_to_send_to))) { log(DEBUG,"Got final IDLE"); @@ -2326,7 +2326,7 @@ class TreeSocket : public InspSocket if (params.size() < 2) return true; - userrec* u = Srv->FindNick(params[0]); + userrec* u = ServerInstance->FindNick(params[0]); if (!u) return true; @@ -2353,7 +2353,7 @@ class TreeSocket : public InspSocket // someone querying our time? if (Srv->GetServerName() == params[0]) { - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) { char curtime[256]; @@ -2366,7 +2366,7 @@ class TreeSocket : public InspSocket else { // not us, pass it on - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if (u) DoOneToOne(prefix,"TIME",params,params[0]); } @@ -2374,7 +2374,7 @@ class TreeSocket : public InspSocket else if (params.size() == 3) { // a response to a previous TIME - userrec* u = Srv->FindNick(params[1]); + userrec* u = ServerInstance->FindNick(params[1]); if ((u) && (IS_LOCAL(u))) { time_t rawtime = atol(params[2].c_str()); @@ -2444,14 +2444,14 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+servername+" already exists!"); - Srv->SendOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); + ServerInstance->WriteOpers("*** Server connection from \2"+servername+"\2 denied, already exists"); return false; } TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL); ParentOfThis->AddChild(Node); params[3] = ":" + params[3]; DoOneToAllButSender(prefix,"SERVER",params,prefix); - Srv->SendOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); + ServerInstance->WriteOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")"); return true; } @@ -2468,7 +2468,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2480,7 +2480,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } // Begin the sync here. this kickstarts the @@ -2501,7 +2501,7 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -2518,7 +2518,7 @@ class TreeSocket : public InspSocket if (hops) { this->WriteLine("ERROR :Server too far away for authentication"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, server is too far away for authentication"); return false; } std::string description = params[3]; @@ -2530,7 +2530,7 @@ class TreeSocket : public InspSocket if (CheckDupe) { this->WriteLine("ERROR :Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName()); return false; } /* If the config says this link is encrypted, but the remote side @@ -2540,10 +2540,10 @@ class TreeSocket : public InspSocket if ((x->EncryptionKey != "") && (!this->ctx_in)) { this->WriteLine("ERROR :This link requires AES encryption to be enabled. Plaintext connection refused."); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, remote server did not enable AES."); return false; } - Srv->SendOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")"); + ServerInstance->WriteOpers("*** Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] ("+description+")"); this->InboundServerName = sname; this->InboundDescription = description; // this is good. Send our details: Our server name and description and hopcount of 0, @@ -2555,7 +2555,7 @@ class TreeSocket : public InspSocket } } this->WriteLine("ERROR :Invalid credentials"); - Srv->SendOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); + ServerInstance->WriteOpers("*** Server connection from \2"+sname+"\2 denied, invalid link credentials"); return false; } @@ -2608,7 +2608,7 @@ class TreeSocket : public InspSocket } else if ((this->ctx_in) && (command == "AES")) { - WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); + ServerInstance->WriteOpers("*** \2AES\2: Encryption already enabled on this connection yet %s is trying to enable it twice!",params[0].c_str()); } switch (this->LinkState) @@ -2676,13 +2676,13 @@ class TreeSocket : public InspSocket long delta = THEM-time(NULL); if ((delta < -600) || (delta > 600)) { - WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta)); + ServerInstance->WriteOpers("*** \2ERROR\2: Your clocks are out by %d seconds (this is more than ten minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta)); this->WriteLine("ERROR :Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than ten minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!"); return false; } else if ((delta < -60) || (delta > 60)) { - WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); + ServerInstance->WriteOpers("*** \2WARNING\2: Your clocks are out by %d seconds, please consider synching your clocks.",abs(delta)); } } this->LinkState = CONNECTED; @@ -2734,7 +2734,7 @@ class TreeSocket : public InspSocket if (prefix != "") { std::string direction = prefix; - userrec* t = Srv->FindNick(prefix); + userrec* t = ServerInstance->FindNick(prefix); if (t) { direction = t->server; @@ -2888,8 +2888,8 @@ class TreeSocket : public InspSocket std::string sourceserv = this->myhost; if (params.size() == 3) { - userrec* user = Srv->FindNick(params[1]); - chanrec* chan = Srv->FindChannel(params[0]); + userrec* user = ServerInstance->FindNick(params[1]); + chanrec* chan = ServerInstance->FindChan(params[0]); if (user && chan) { if (!chan->ServerKickUser(user, params[2].c_str(), false)) @@ -2928,7 +2928,7 @@ class TreeSocket : public InspSocket { sourceserv = this->InboundServerName; } - WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); + ServerInstance->WriteOpers("*** Received end of netburst from \2%s\2",sourceserv.c_str()); return true; } else @@ -2936,7 +2936,7 @@ class TreeSocket : public InspSocket // not a special inter-server command. // Emulate the actual user doing the command, // this saves us having a huge ugly parser. - userrec* who = Srv->FindNick(prefix); + userrec* who = ServerInstance->FindNick(prefix); std::string sourceserv = this->myhost; if (this->InboundServerName != "") { @@ -2950,7 +2950,7 @@ class TreeSocket : public InspSocket * already exist here. If it does, kill their copy, * and our copy. */ - userrec* x = Srv->FindNick(params[0]); + userrec* x = ServerInstance->FindNick(params[0]); if ((x) && (x != who)) { std::deque<std::string> p; @@ -2962,7 +2962,7 @@ class TreeSocket : public InspSocket p.push_back("Nickname collision"); DoOneToMany(Srv->GetServerName(),"KILL",p); userrec::QuitUser(this->Instance,x,"Nickname collision ("+prefix+" -> "+params[0]+")"); - userrec* y = Srv->FindNick(prefix); + userrec* y = ServerInstance->FindNick(prefix); if (y) { userrec::QuitUser(this->Instance,y,"Nickname collision"); @@ -3019,7 +3019,7 @@ class TreeSocket : public InspSocket { if (this->LinkState == CONNECTING) { - Srv->SendOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); + ServerInstance->WriteOpers("*** CONNECT: Connection to \002"+myhost+"\002 timed out."); } } @@ -3038,7 +3038,7 @@ class TreeSocket : public InspSocket { Squit(s,"Remote host closed the connection"); } - WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); + ServerInstance->WriteOpers("Server '\2%s\2' closed the connection.",quitserver.c_str()); } virtual int OnIncomingConnection(int newsock, char* ip) @@ -3058,7 +3058,7 @@ class TreeSocket : public InspSocket if (!found) { - WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); + ServerInstance->WriteOpers("Server connection from %s denied (no link blocks with that IP address)", ip); close(newsock); return false; } @@ -3107,7 +3107,7 @@ class ServernameResolver : public Resolver else { /* Something barfed, show the opers */ - WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",MyLink.Name.c_str(),strerror(errno)); delete newsocket; } } @@ -3116,7 +3116,7 @@ class ServernameResolver : public Resolver void OnError(ResolverError e, const std::string &errormessage) { /* Ooops! */ - WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str()); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: Unable to resolve hostname - %s",MyLink.Name.c_str(),errormessage.c_str()); } }; @@ -3184,7 +3184,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref if ((*(params[0].c_str()) != '#') && (*(params[0].c_str()) != '$')) { // special routing for private messages/notices - userrec* d = Srv->FindNick(params[0]); + userrec* d = ServerInstance->FindNick(params[0]); if (d) { std::deque<std::string> par; @@ -3205,7 +3205,7 @@ bool DoOneToAllButSenderRaw(std::string data, std::string omit, std::string pref else { log(DEBUG,"Channel privmsg going to chan %s",params[0].c_str()); - chanrec* c = Srv->FindChannel(params[0]); + chanrec* c = ServerInstance->FindChan(params[0]); if (c) { std::deque<TreeServer*> list; @@ -3666,7 +3666,7 @@ class ModuleSpanningTree : public Module if (sock) { log(DEBUG,"Splitting server %s",s->GetName().c_str()); - WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); + ServerInstance->WriteOpers("*** SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick); sock->Squit(s,"Server quit by "+std::string(user->nick)+"!"+std::string(user->ident)+"@"+std::string(user->host)); Srv->RemoveSocket(sock); } @@ -3710,7 +3710,7 @@ class ModuleSpanningTree : public Module { if ((IS_LOCAL(user)) && (pcnt > 1)) { - userrec* remote = Srv->FindNick(parameters[1]); + userrec* remote = ServerInstance->FindNick(parameters[1]); if ((remote) && (remote->fd < 0)) { std::deque<std::string> params; @@ -3746,7 +3746,7 @@ class ModuleSpanningTree : public Module else { // they didnt answer, boot them - WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); + ServerInstance->WriteOpers("*** Server \002%s\002 pinged out",serv->GetName().c_str()); sock->Squit(serv,"Ping timeout"); Srv->RemoveSocket(sock); return; @@ -3768,7 +3768,7 @@ class ModuleSpanningTree : public Module if (!CheckDupe) { // an autoconnected server is not connected. Check if its time to connect it - WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); + ServerInstance->WriteOpers("*** AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect); insp_inaddr binip; @@ -3782,7 +3782,7 @@ class ModuleSpanningTree : public Module } else { - WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** AUTOCONNECT: Error autoconnecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); delete newsocket; } } @@ -3863,7 +3863,7 @@ class ModuleSpanningTree : public Module } else { - WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->WriteOpers("*** CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); delete newsocket; } } @@ -3902,7 +3902,7 @@ class ModuleSpanningTree : public Module results.push_back(Srv->GetServerName()+" 244 "+user->nick+" H * * "+LinkBlocks[i].Name.c_str()); } results.push_back(Srv->GetServerName()+" 219 "+user->nick+" "+statschar+" :End of /STATS report"); - WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host); + ServerInstance->WriteOpers("*** Notice: %s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host); return 1; } return 0; @@ -4275,7 +4275,7 @@ class ModuleSpanningTree : public Module // check for self if (Srv->MatchText(Srv->GetServerName(),parameter)) { - Srv->SendOpers("*** Remote rehash initiated from server \002"+Srv->GetServerName()+"\002."); + ServerInstance->WriteOpers("*** Remote rehash initiated from server \002"+Srv->GetServerName()+"\002."); Srv->RehashServer(); } } @@ -4461,14 +4461,14 @@ class ModuleSpanningTree : public Module return; // Insert the TS value of the object, either userrec or chanrec time_t ourTS = 0; - userrec* a = Srv->FindNick((*params)[0]); + userrec* a = ServerInstance->FindNick((*params)[0]); if (a) { ourTS = a->age; } else { - chanrec* a = Srv->FindChannel((*params)[0]); + chanrec* a = ServerInstance->FindChan((*params)[0]); if (a) { ourTS = a->age; diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp index 40be036ab..041814f9b 100644 --- a/src/modules/m_spy.cpp +++ b/src/modules/m_spy.cpp @@ -94,11 +94,11 @@ class cmd_spylist : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - WriteOpers("*** Oper %s used SPYLIST to list +s/+p channels and keys.",user->nick); + ServerInstance->WriteOpers("*** Oper %s used SPYLIST to list +s/+p channels and keys.",user->nick); user->WriteServ("321 %s Channel :Users Name",user->nick); for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++) { - user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,i->second->GetUserCounter(),chanmodes(i->second,true),i->second->topic); + user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,i->second->GetUserCounter(),i->second->ChanModes(true),i->second->topic); } user->WriteServ("323 %s :End of channel list.",user->nick); } @@ -126,9 +126,9 @@ class cmd_spynames : public command_t if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1)) return; - WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]); + ServerInstance->WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]); - c = FindChan(parameters[0]); + c = ServerInstance->FindChan(parameters[0]); if (c) { spy_userlist(user,c); diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp index cb400a0bf..35ffd6d8f 100644 --- a/src/modules/m_swhois.cpp +++ b/src/modules/m_swhois.cpp @@ -22,6 +22,8 @@ /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */ +extern InspIRCd* ServerInstance; + class cmd_swhois : public command_t { Server* Srv; @@ -35,7 +37,7 @@ class cmd_swhois : public command_t void Handle(const char** parameters, int pcnt, userrec* user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); + userrec* dest = ServerInstance->FindNick(parameters[0]); if(dest) { std::string line; @@ -56,7 +58,7 @@ class cmd_swhois : public command_t if (!Srv->IsUlined(user->server)) // Ulines set SWHOISes silently - WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); + ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str()); dest->Shrink("swhois"); DELETE(text); @@ -64,7 +66,7 @@ class cmd_swhois : public command_t else if(!Srv->IsUlined(user->server)) { // Ulines set SWHOISes silently - WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); + ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str()); } text = new std::string(line); diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 426859390..14e68dfda 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -52,7 +52,7 @@ class cmd_tban : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - chanrec* channel = Srv->FindChannel(parameters[0]); + chanrec* channel = ServerInstance->FindChan(parameters[0]); if (channel) { std::string cm = Srv->ChanMode(user,channel); @@ -159,7 +159,7 @@ class ModuleTimedBans : public Module { if (curtime > i->expire) { - chanrec* cr = Srv->FindChannel(i->channel); + chanrec* cr = ServerInstance->FindChan(i->channel); again = true; if (cr) { diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp index bde81011d..8d8d46c47 100644 --- a/src/modules/m_uninvite.cpp +++ b/src/modules/m_uninvite.cpp @@ -24,8 +24,10 @@ using namespace std; #include "modules.h" #include "helperfuncs.h" #include "message.h" +#include "inspircd.h" static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_uninvite : public command_t { @@ -38,8 +40,8 @@ class cmd_uninvite : public command_t void Handle (const char** parameters, int pcnt, userrec *user) { - userrec* u = Find(parameters[0]); - chanrec* c = FindChan(parameters[1]); + userrec* u = ServerInstance->FindNick(parameters[0]); + chanrec* c = ServerInstance->FindChan(parameters[1]); if ((!c) || (!u)) { diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp index 1ad0e1c58..80ab67be1 100644 --- a/src/modules/m_userip.cpp +++ b/src/modules/m_userip.cpp @@ -22,10 +22,12 @@ using namespace std; #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "inspircd.h" /* $ModDesc: Provides support for USERIP command */ static Server *Srv; +extern InspIRCd* ServerInstance; class cmd_userip : public command_t { @@ -42,7 +44,7 @@ class cmd_userip : public command_t snprintf(Return,MAXBUF,"340 %s :",user->nick); for (int i = 0; i < pcnt; i++) { - userrec *u = Find(parameters[i]); + userrec *u = ServerInstance->FindNick(parameters[i]); if (u) { snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",u->ident,u->GetIPString()); diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp index 2ba9c9afb..8e6b2c50c 100644 --- a/src/modules/m_watch.cpp +++ b/src/modules/m_watch.cpp @@ -29,6 +29,7 @@ using namespace std; /* $ModDesc: Provides support for the /watch command */ static Server *Srv; +extern InspIRCd* ServerInstance; class watchentry : public classbase { @@ -58,7 +59,7 @@ class cmd_watch : public command_t watchentry* a = (watchentry*)(*q); if (a->watcher == user) { - userrec* targ = Srv->FindNick(a->target); + userrec* targ = ServerInstance->FindNick(a->target); if (targ) { user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age); @@ -99,7 +100,7 @@ class cmd_watch : public command_t watchentry* a = (watchentry*)(*q); if (a->watcher == user) { - userrec* targ = Srv->FindNick(a->target); + userrec* targ = ServerInstance->FindNick(a->target); if (targ) { user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age); @@ -136,7 +137,7 @@ class cmd_watch : public command_t if (b->watcher == user) { irc::string n2 = b->target.c_str(); - userrec* a = Srv->FindNick(b->target); + userrec* a = ServerInstance->FindNick(b->target); if (a) { user->WriteServ("602 %s %s %s %s %lu :stopped watching",user->nick,a->nick,a->ident,a->dhost,a->age); @@ -180,7 +181,7 @@ class cmd_watch : public command_t watches.push_back(w); log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick); } - userrec* a = Srv->FindNick(nick); + userrec* a = ServerInstance->FindNick(nick); if (a) { user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,a->nick,a->ident,a->dhost,a->age); |