diff options
Diffstat (limited to 'src')
36 files changed, 202 insertions, 202 deletions
diff --git a/src/actions.c b/src/actions.c index 27dad2812..2b58e0434 100644 --- a/src/actions.c +++ b/src/actions.c @@ -89,7 +89,7 @@ void sqline(char *mask, char *reason) if (ircd->chansqline) { if (*mask == '#') { - anope_cmd_sqline(mask, reason); + anope_SendSQLine(mask, reason); for (i = 0; i < 1024; i++) { for (c = chanlist[i]; c; c = next) { @@ -113,10 +113,10 @@ void sqline(char *mask, char *reason) } } } else { - anope_cmd_sqline(mask, reason); + anope_SendSQLine(mask, reason); } } else { - anope_cmd_sqline(mask, reason); + anope_SendSQLine(mask, reason); } } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index eba82f5f9..6fc34a6bb 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -294,8 +294,8 @@ int do_bot(User * u) else we must make it quit and rejoin. We must not forget to set the Q:Line either (it's otherwise set in anope_SendClientIntroduction) */ if (!user) { - anope_cmd_chg_nick(oldnick, bi->nick); - anope_cmd_sqline(bi->nick, "Reserved for services"); + anope_SendChangeBotNick(oldnick, bi->nick); + anope_SendSQLine(bi->nick, "Reserved for services"); } else { anope_SendQuit(oldnick, "Quit: Be right back"); diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index 599f51605..19f0202dc 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -123,7 +123,7 @@ int do_forbid(User * u) u->nick, ci->name); if (ircd->chansqline) { - anope_cmd_sqline(ci->name, ((reason) ? reason : "Forbidden")); + anope_SendSQLine(ci->name, ((reason) ? reason : "Forbidden")); } alog("%s: %s set FORBID for channel %s", s_ChanServ, u->nick, diff --git a/src/core/hs_on.c b/src/core/hs_on.c index 6ff31d0a7..0d71ee768 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -82,7 +82,7 @@ int do_on(User * u) } else { notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); } - anope_cmd_vhost_on(u->nick, vIdent, vHost); + anope_SendVhost(u->nick, vIdent, vHost); if (ircd->vhost) { u->vhost = sstrdup(vHost); } diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index ce26af71e..a2f68c911 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -115,7 +115,7 @@ int do_forbid(User * u) if (ircd->sqline) { - anope_cmd_sqline(na->nick, ((reason) ? reason : "Forbidden")); + anope_SendSQLine(na->nick, ((reason) ? reason : "Forbidden")); } if (WallForbid) diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 8a9adb9c9..7b3d2fbc5 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -89,7 +89,7 @@ int do_operoline(User * u) if (!(u2 = finduser(nick))) { notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick); } else if (u2 && flags[0] == '+') { - anope_cmd_svso(s_OperServ, nick, flags); + anope_SendSVSO(s_OperServ, nick, flags); anope_SendMode(s_OperServ, nick, "+o"); common_svsmode(u2, "+o", NULL); notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP); @@ -97,7 +97,7 @@ int do_operoline(User * u) anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); } else if (u2 && flags[0] == '-') { - anope_cmd_svso(s_OperServ, nick, flags); + anope_SendSVSO(s_OperServ, nick, flags); notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick); anope_SendGlobops(s_OperServ, "\2%s\2 used OLINE for %s", u->nick, nick); diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index b6c269fa6..ea44bc1b0 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -119,7 +119,7 @@ int do_svsnick(User * u) notice_lang(s_OperServ, u, OPER_SVSNICK_NEWNICK, nick, newnick); anope_SendGlobops(s_OperServ, "%s used SVSNICK to change %s to %s", u->nick, nick, newnick); - anope_cmd_svsnick(nick, newnick, time(NULL)); + anope_SendForceNickChange(nick, newnick, time(NULL)); } return MOD_CONT; } diff --git a/src/hostserv.c b/src/hostserv.c index 9683712a7..1f566299a 100644 --- a/src/hostserv.c +++ b/src/hostserv.c @@ -562,7 +562,7 @@ int do_on_id(User * u) } else { notice_lang(s_HostServ, u, HOST_ACTIVATED, vHost); } - anope_cmd_vhost_on(u->nick, vIdent, vHost); + anope_SendVhost(u->nick, vIdent, vHost); if (ircd->vhost) { u->vhost = sstrdup(vHost); } diff --git a/src/ircd.c b/src/ircd.c index a8b60756f..2af496e54 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -247,34 +247,34 @@ void anope_SendGlobops(const char *source, const char *fmt, ...) ircdproto->SendGlobops(source, buf); } -void anope_cmd_sqline(const char *mask, const char *reason) +void anope_SendSQLine(const char *mask, const char *reason) { - ircdproto->cmd_sqline(mask, reason); + ircdproto->SendSQLine(mask, reason); } -void anope_cmd_squit(const char *servname, const char *message) +void anope_SendSquit(const char *servname, const char *message) { - ircdproto->cmd_squit(servname, message); + ircdproto->SendSquit(servname, message); } -void anope_cmd_svso(const char *source, const char *nick, const char *flag) +void anope_SendSVSO(const char *source, const char *nick, const char *flag) { - ircdproto->cmd_svso(source, nick, flag); + ircdproto->SendSVSO(source, nick, flag); } -void anope_cmd_chg_nick(const char *oldnick, const char *newnick) +void anope_SendChangeBotNick(const char *oldnick, const char *newnick) { - ircdproto->cmd_chg_nick(oldnick, newnick); + ircdproto->SendChangeBotNick(oldnick, newnick); } -void anope_cmd_svsnick(const char *source, const char *guest, time_t when) +void anope_SendForceNickChange(const char *source, const char *guest, time_t when) { - ircdproto->cmd_svsnick(source, guest, when); + ircdproto->SendForceNickChange(source, guest, when); } -void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void anope_SendVhost(const char *nick, const char *vIdent, const char *vhost) { - ircdproto->cmd_vhost_on(nick, vIdent, vhost); + ircdproto->SendVhost(nick, vIdent, vhost); } void anope_cmd_connect() diff --git a/src/main.c b/src/main.c index 30cff5670..30ab9c88c 100644 --- a/src/main.c +++ b/src/main.c @@ -234,7 +234,7 @@ static void services_restart(void) send_event(EVENT_RESTART, 1, EVENT_START); if (!quitmsg) quitmsg = "Restarting"; - anope_cmd_squit(ServerName, quitmsg); + anope_SendSquit(ServerName, quitmsg); disconn(servsock); close_log(); /* First don't unload protocol module, then do so */ @@ -283,7 +283,7 @@ static void services_shutdown(void) quitmsg = "Terminating, reason unknown"; alog("%s", quitmsg); if (started) { - anope_cmd_squit(ServerName, quitmsg); + anope_SendSquit(ServerName, quitmsg); Anope_Free(uplink); Anope_Free(mod_current_buffer); if (ircd->chanmodes) { @@ -647,7 +647,7 @@ int main(int ac, char **av, char **envp) alog("Restarting"); if (!quitmsg) quitmsg = "Restarting"; - anope_cmd_squit(ServerName, quitmsg); + anope_SendSquit(ServerName, quitmsg); disconn(servsock); close_log(); #ifdef _WIN32 diff --git a/src/nickserv.c b/src/nickserv.c index f1acba6eb..1d60aa5ab 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -1542,7 +1542,7 @@ void collide(NickAlias * na, int from_timeout) } while (finduser(guestnick)); notice_lang(s_NickServ, na->u, FORCENICKCHANGE_CHANGING, guestnick); - anope_cmd_svsnick(na->nick, guestnick, time(NULL)); + anope_SendForceNickChange(na->nick, guestnick, time(NULL)); na->status |= NS_GUESTED; } else { kill_user(s_NickServ, na->nick, "Services nickname-enforcer kill"); diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index e867af711..86b3115de 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -663,7 +663,7 @@ void moduleAddIRCDMsgs(void) { /* *INDENT-ON* */ /* SQLINE */ -void BahamutIRCdProto::cmd_sqline(const char *mask, const char *reason) +void BahamutIRCdProto::SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) return; send_cmd(NULL, "SQLINE %s :%s", mask, reason); @@ -990,7 +990,7 @@ void BahamutIRCdProto::SendClientIntroduction(const char *nick, const char *user { EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real); - cmd_sqline(nick, "Reserved for services"); + SendSQLine(nick, "Reserved for services"); } void BahamutIRCdProto::SendGuestNick(const char *nick, const char *user, const char *host, const char *real, const char *modes) diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 107b7ffe7..a97e92af3 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -74,7 +74,7 @@ class BahamutIRCdProto : public IRCDProto { void SendBotOp(const char *, const char *); void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); - void cmd_sqline(const char *, const char *); + void SendSQLine(const char *, const char *); void cmd_connect(); void cmd_svshold(const char *); void cmd_release_svshold(const char *); diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 218577c87..42c283592 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -707,7 +707,7 @@ void moduleAddIRCDMsgs(void) /* *INDENT-ON* */ -void CharybdisProto::cmd_sqline(const char *mask, const char *reason) +void CharybdisProto::SendSQLine(const char *mask, const char *reason) { Uid *ud = find_uid(s_OperServ); send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason); @@ -740,7 +740,7 @@ void CharybdisProto::SendVhostDel(User *u) send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", u->nick, u->host); } -void CharybdisProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void CharybdisProto::SendVhost(const char *nick, const char *vIdent, const char *vhost) { send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", nick, vhost); } @@ -867,7 +867,7 @@ void CharybdisProto::SendClientIntroduction(const char *nick, const char *user, new_uid(nick, uidbuf); } else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real); - cmd_sqline(nick, "Reserved for services"); + SendSQLine(nick, "Reserved for services"); } void CharybdisProto::SendPart(const char *nick, const char *chan, const char *buf) @@ -1195,7 +1195,7 @@ void CharybdisProto::cmd_release_svshold(const char *nick) } /* SVSNICK */ -void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_t when) +void CharybdisProto::SendForceNickChange(const char *oldnick, const char *newnick, time_t when) { if (!oldnick || !newnick) return; User *u = finduser(oldnick); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 9065c47f1..c8151a419 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -65,9 +65,9 @@ class CharybdisProto : public IRCDTS6Proto { void SendInvite(const char *, const char *, const char *); void SendPart(const char *, const char *, const char *); void SendGlobops(const char *, const char *); - void cmd_sqline(const char *, const char *); - void cmd_svsnick(const char *, const char *, time_t); - void cmd_vhost_on(const char *, const char *, const char *); + void SendSQLine(const char *, const char *); + void SendForceNickChange(const char *, const char *, time_t); + void SendVhost(const char *, const char *, const char *); void cmd_connect(); void cmd_svshold(const char *); void cmd_release_svshold(const char *); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 669bcaec1..48063295d 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -785,14 +785,14 @@ void inspircd_cmd_chgident(const char *nick, const char *vIdent) } /* SQLINE */ -void InspIRCdProto::cmd_sqline(const char *mask, const char *reason) +void InspIRCdProto::SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) return; send_cmd(ServerName, "ADDLINE Q %s %s %ld 0 :%s", mask, s_OperServ, static_cast<long>(time(NULL)), reason); } /* SQUIT */ -void InspIRCdProto::cmd_squit(const char *servname, const char *message) +void InspIRCdProto::SendSquit(const char *servname, const char *message) { if (!servname || !message) return; send_cmd(ServerName, "SQUIT %s :%s", servname, message); @@ -800,7 +800,7 @@ void InspIRCdProto::cmd_squit(const char *servname, const char *message) /* Functions that use serval cmd functions */ -void InspIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void InspIRCdProto::SendVhost(const char *nick, const char *vIdent, const char *vhost) { if (!nick) return; if (vIdent) inspircd_cmd_chgident(nick, vIdent); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index 2ec399b27..cfa75fb26 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -79,9 +79,9 @@ class InspIRCdProto : public IRCDProto { void SendBotOp(const char *, const char *); void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); - void cmd_sqline(const char *, const char *); - void cmd_squit(const char *, const char *); - void cmd_vhost_on(const char *, const char *, const char *); + void SendSQLine(const char *, const char *); + void SendSquit(const char *, const char *); + void SendVhost(const char *, const char *, const char *); void cmd_connect(); void cmd_svshold(const char *); void cmd_release_svshold(const char *); diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c index cc5d4eb79..8e8c2dd47 100644 --- a/src/protocol/obsolete/hybrid.c +++ b/src/protocol/obsolete/hybrid.c @@ -653,7 +653,7 @@ void moduleAddIRCDMsgs(void) { /* *INDENT-ON* */ -void hybrid_cmd_sqline(const char *mask, const char *reason) +void hybrid_SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) { return; @@ -709,7 +709,7 @@ void hybrid_SendVhostDel(User * u) /* does not support vhosting */ } -void hybrid_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void hybrid_SendVhost(const char *nick, const char *vIdent, const char *vhost) { /* does not support vhosting */ } @@ -1192,7 +1192,7 @@ void hybrid_SendInvite(const char *source, const char *chan, const char *nick) } /* SQUIT */ -void hybrid_cmd_squit(const char *servname, const char *message) +void hybrid_SendSquit(const char *servname, const char *message) { if (!servname || !message) { return; @@ -1268,7 +1268,7 @@ void hybrid_cmd_release_svshold(const char *nick) } /* SVSNICK */ -void hybrid_cmd_svsnick(const char *nick, const char *newnick, time_t when) +void hybrid_SendForceNickChange(const char *nick, const char *newnick, time_t when) { /* Not Supported by this IRCD */ } @@ -1280,7 +1280,7 @@ void hybrid_SendGuestNick(const char *nick, const char *user, const char *host, (long int) time(NULL), modes, user, host, ServerName, real); } -void hybrid_cmd_svso(const char *source, const char *nick, const char *flag) +void hybrid_SendSVSO(const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1324,7 +1324,7 @@ void hybrid_cmd_svid_umode3(User * u, const char *ts) } /* NICK <newnick> */ -void hybrid_cmd_chg_nick(const char *oldnick, const char *newnick) +void hybrid_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1406,7 +1406,7 @@ void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason) reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - hybrid_cmd_squit(jserver, rbuf); + hybrid_SendSquit(jserver, rbuf); hybrid_cmd_server(jserver, 2, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1496,12 +1496,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(hybrid_cmd_211); pmodule_SendGlobops(hybrid_cmd_global); pmodule_SendGlobops_legacy(hybrid_cmd_global_legacy); - pmodule_cmd_sqline(hybrid_cmd_sqline); - pmodule_cmd_squit(hybrid_cmd_squit); - pmodule_cmd_svso(hybrid_cmd_svso); - pmodule_cmd_chg_nick(hybrid_cmd_chg_nick); - pmodule_cmd_svsnick(hybrid_cmd_svsnick); - pmodule_cmd_vhost_on(hybrid_cmd_vhost_on); + pmodule_SendSQLine(hybrid_cmd_sqline); + pmodule_SendSquit(hybrid_cmd_squit); + pmodule_SendSVSO(hybrid_cmd_svso); + pmodule_SendChangeBotNick(hybrid_cmd_chg_nick); + pmodule_SendForceNickChange(hybrid_cmd_svsnick); + pmodule_SendVhost(hybrid_cmd_vhost_on); pmodule_cmd_connect(hybrid_cmd_connect); pmodule_cmd_svshold(hybrid_cmd_svshold); pmodule_cmd_release_svshold(hybrid_cmd_release_svshold); diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h index 4f6ed09b2..99a8885e7 100644 --- a/src/protocol/obsolete/hybrid.h +++ b/src/protocol/obsolete/hybrid.h @@ -87,12 +87,12 @@ void hybrid_cmd_243(const char *buf); void hybrid_cmd_211(const char *buf); void hybrid_SendGlobops(const char *source, const char *buf); void hybrid_SendGlobops_legacy(const char *source, const char *fmt); -void hybrid_cmd_sqline(const char *mask, const char *reason); -void hybrid_cmd_squit(const char *servname, const char *message); -void hybrid_cmd_svso(const char *source, const char *nick, const char *flag); -void hybrid_cmd_chg_nick(const char *oldnick, const char *newnick); -void hybrid_cmd_svsnick(const char *source, const char *guest, time_t when); -void hybrid_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void hybrid_SendSQLine(const char *mask, const char *reason); +void hybrid_SendSquit(const char *servname, const char *message); +void hybrid_SendSVSO(const char *source, const char *nick, const char *flag); +void hybrid_SendChangeBotNick(const char *oldnick, const char *newnick); +void hybrid_SendForceNickChange(const char *source, const char *guest, time_t when); +void hybrid_SendVhost(const char *nick, const char *vIdent, const char *vhost); void hybrid_cmd_connect(int servernum); void hybrid_cmd_svshold(const char *nick); void hybrid_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c index 142785c1e..6bc5aa3a9 100644 --- a/src/protocol/obsolete/plexus3.c +++ b/src/protocol/obsolete/plexus3.c @@ -753,7 +753,7 @@ moduleAddIRCDMsgs (void) } void -plexus_cmd_sqline (const char *mask, const char *reason) +plexus_SendSQLine (const char *mask, const char *reason) { send_cmd (s_OperServ, "RESV * %s :%s", mask, reason); } @@ -813,7 +813,7 @@ plexus_SendVhostDel (User * u) } void -plexus_cmd_vhost_on (const char *nick, const char *vIdent, const char *vhost) +plexus_SendVhost (const char *nick, const char *vIdent, const char *vhost) { User *u; @@ -976,7 +976,7 @@ plexus_SendClientIntroduction (const char *nick, const char *user, const char *h send_cmd (ServerName, "NICK %s 1 %ld %s %s %s %s 0 %s :%s", nick, (long int) time (NULL), modes, user, host, ServerName, host, real); - plexus_cmd_sqline (nick, "Reserved for services"); + plexus_SendSQLine (nick, "Reserved for services"); } @@ -1396,7 +1396,7 @@ plexus_SendInvite (const char *source, const char *chan, const char *nick) /* SQUIT */ void -plexus_cmd_squit (const char *servname, const char *message) +plexus_SendSquit (const char *servname, const char *message) { if (!servname || !message) { @@ -1497,7 +1497,7 @@ plexus_cmd_release_svshold (const char *nick) /* SVSNICK */ void -plexus_cmd_svsnick (const char *nick, const char *newnick, time_t when) +plexus_SendForceNickChange (const char *nick, const char *newnick, time_t when) { User *u; @@ -1520,7 +1520,7 @@ plexus_SendGuestNick (const char *nick, const char *user, const char *host, cons } void -plexus_cmd_svso (const char *source, const char *nick, const char *flag) +plexus_SendSVSO (const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1587,7 +1587,7 @@ plexus_cmd_svid_umode3 (User * u, const char *ts) /* NICK <newnick> */ void -plexus_cmd_chg_nick (const char *oldnick, const char *newnick) +plexus_SendChangeBotNick (const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { @@ -1683,7 +1683,7 @@ plexus_cmd_jupe (const char *jserver, const char *who, const char *reason) reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - plexus_cmd_squit (jserver, rbuf); + plexus_SendSquit (jserver, rbuf); plexus_cmd_server (jserver, 2, rbuf); new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1780,12 +1780,12 @@ moduleAddAnopeCmds () pmodule_cmd_211 (plexus_cmd_211); pmodule_SendGlobops (plexus_cmd_global); pmodule_SendGlobops_legacy (plexus_cmd_global_legacy); - pmodule_cmd_sqline (plexus_cmd_sqline); - pmodule_cmd_squit (plexus_cmd_squit); - pmodule_cmd_svso (plexus_cmd_svso); - pmodule_cmd_chg_nick (plexus_cmd_chg_nick); - pmodule_cmd_svsnick (plexus_cmd_svsnick); - pmodule_cmd_vhost_on (plexus_cmd_vhost_on); + pmodule_SendSQLine (plexus_cmd_sqline); + pmodule_SendSquit (plexus_cmd_squit); + pmodule_SendSVSO (plexus_cmd_svso); + pmodule_SendChangeBotNick (plexus_cmd_chg_nick); + pmodule_SendForceNickChange (plexus_cmd_svsnick); + pmodule_SendVhost (plexus_cmd_vhost_on); pmodule_cmd_connect (plexus_cmd_connect); pmodule_cmd_svshold (plexus_cmd_svshold); pmodule_cmd_release_svshold (plexus_cmd_release_svshold); diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h index 5475e8d17..b3fc7140b 100644 --- a/src/protocol/obsolete/plexus3.h +++ b/src/protocol/obsolete/plexus3.h @@ -83,12 +83,12 @@ void plexus_cmd_243(const char *buf); void plexus_cmd_211(const char *buf); void plexus_SendGlobops(const char *source, const char *buf); void plexus_SendGlobops_legacy(const char *source, const char *fmt); -void plexus_cmd_sqline(const char *mask, const char *reason); -void plexus_cmd_squit(const char *servname, const char *message); -void plexus_cmd_svso(const char *source, const char *nick, const char *flag); -void plexus_cmd_chg_nick(const char *oldnick, const char *newnick); -void plexus_cmd_svsnick(const char *source, const char *guest, time_t when); -void plexus_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void plexus_SendSQLine(const char *mask, const char *reason); +void plexus_SendSquit(const char *servname, const char *message); +void plexus_SendSVSO(const char *source, const char *nick, const char *flag); +void plexus_SendChangeBotNick(const char *oldnick, const char *newnick); +void plexus_SendForceNickChange(const char *source, const char *guest, time_t when); +void plexus_SendVhost(const char *nick, const char *vIdent, const char *vhost); void plexus_cmd_connect(int servernum); void plexus_cmd_svshold(const char *nick); void plexus_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c index 4229fbbc1..1f7360708 100644 --- a/src/protocol/obsolete/ptlink.c +++ b/src/protocol/obsolete/ptlink.c @@ -667,7 +667,7 @@ int anope_event_capab(const char *source, int ac, const char **av) parv[1] = sqlined nick/mask parv[2] = reason */ -void ptlink_cmd_sqline(const char *mask, const char *reason) +void ptlink_SendSQLine(const char *mask, const char *reason) { send_cmd(ServerName, "SQLINE %s :%s", mask, reason); } @@ -792,7 +792,7 @@ int anope_event_error(const char *source, int ac, const char **av) return MOD_CONT; } -void ptlink_cmd_squit(const char *servname, const char *message) +void ptlink_SendSquit(const char *servname, const char *message) { send_cmd(NULL, "SQUIT %s :%s", servname, message); } @@ -1205,7 +1205,7 @@ void ptlink_cmd_nick(const char *nick, const char *name, const char *mode) send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick, (unsigned long int) time(NULL), mode, ServiceUser, ServiceHost, ServiceHost, ServerName, name); - ptlink_cmd_sqline(nick, "Reserved for services"); + ptlink_SendSQLine(nick, "Reserved for services"); } void ptlink_SendKick(const char *source, const char *chan, const char *user, const char *buf) @@ -1260,7 +1260,7 @@ void ptlink_SendVhostDel(User * u) /* does not support vhosting */ } -void ptlink_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void ptlink_SendVhost(const char *nick, const char *vIdent, const char *vhost) { User *u; @@ -1386,7 +1386,7 @@ void ptlink_SendClientIntroduction(const char *nick, const char *user, const cha send_cmd(NULL, "NICK %s 1 %lu %s %s %s %s %s :%s", nick, (unsigned long int) time(NULL), modes, user, host, host, ServerName, real); - ptlink_cmd_sqline(nick, "Reserved for services"); + ptlink_SendSQLine(nick, "Reserved for services"); } @@ -1466,7 +1466,7 @@ void ptlink_cmd_sgline(const char *mask, const char *reason) parv[2] = new nick e.g.: :NickServ SVSNICK Smiler 67455223 _Smiler- */ -void ptlink_cmd_svsnick(const char *source, const char *guest, time_t when) +void ptlink_SendForceNickChange(const char *source, const char *guest, time_t when) { if (!source || !guest) { return; @@ -1495,7 +1495,7 @@ void ptlink_SendSVSMode_chan(const char *name, const char *mode, const char *nic /* Not Supported by this IRCD */ } -void ptlink_cmd_svso(const char *source, const char *nick, const char *flag) +void ptlink_SendSVSO(const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1534,7 +1534,7 @@ void ptlink_cmd_svid_umode3(User * u, const char *ts) parv[1] = new nick parv[2] = TS (timestamp from user's server when nick changed was received) */ -void ptlink_cmd_chg_nick(const char *oldnick, const char *newnick) +void ptlink_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1629,7 +1629,7 @@ void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason) reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - ptlink_cmd_squit(jserver, rbuf); + ptlink_SendSquit(jserver, rbuf); ptlink_cmd_server(jserver, 1, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1725,12 +1725,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(ptlink_cmd_211); pmodule_SendGlobops(ptlink_cmd_global); pmodule_SendGlobops_legacy(ptlink_cmd_global_legacy); - pmodule_cmd_sqline(ptlink_cmd_sqline); - pmodule_cmd_squit(ptlink_cmd_squit); - pmodule_cmd_svso(ptlink_cmd_svso); - pmodule_cmd_chg_nick(ptlink_cmd_chg_nick); - pmodule_cmd_svsnick(ptlink_cmd_svsnick); - pmodule_cmd_vhost_on(ptlink_cmd_vhost_on); + pmodule_SendSQLine(ptlink_cmd_sqline); + pmodule_SendSquit(ptlink_cmd_squit); + pmodule_SendSVSO(ptlink_cmd_svso); + pmodule_SendChangeBotNick(ptlink_cmd_chg_nick); + pmodule_SendForceNickChange(ptlink_cmd_svsnick); + pmodule_SendVhost(ptlink_cmd_vhost_on); pmodule_cmd_connect(ptlink_cmd_connect); pmodule_cmd_svshold(ptlink_cmd_svshold); pmodule_cmd_release_svshold(ptlink_cmd_release_svshold); diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h index a9a342d81..6730b285e 100644 --- a/src/protocol/obsolete/ptlink.h +++ b/src/protocol/obsolete/ptlink.h @@ -122,12 +122,12 @@ void ptlink_cmd_243(const char *buf); void ptlink_cmd_211(const char *buf); void ptlink_SendGlobops(const char *source, const char *buf); void ptlink_SendGlobops_legacy(const char *source, const char *fmt); -void ptlink_cmd_sqline(const char *mask, const char *reason); -void ptlink_cmd_squit(const char *servname, const char *message); -void ptlink_cmd_svso(const char *source, const char *nick, const char *flag); -void ptlink_cmd_chg_nick(const char *oldnick, const char *newnick); -void ptlink_cmd_svsnick(const char *source, const char *guest, time_t when); -void ptlink_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void ptlink_SendSQLine(const char *mask, const char *reason); +void ptlink_SendSquit(const char *servname, const char *message); +void ptlink_SendSVSO(const char *source, const char *nick, const char *flag); +void ptlink_SendChangeBotNick(const char *oldnick, const char *newnick); +void ptlink_SendForceNickChange(const char *source, const char *guest, time_t when); +void ptlink_SendVhost(const char *nick, const char *vIdent, const char *vhost); void ptlink_cmd_connect(int servernum); void ptlink_cmd_svshold(const char *nick); void ptlink_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c index f7929dd6a..f4348e804 100644 --- a/src/protocol/obsolete/rageircd.c +++ b/src/protocol/obsolete/rageircd.c @@ -596,7 +596,7 @@ int anope_event_burst(const char *source, int ac, const char **av) return MOD_CONT; } -void rageircd_cmd_sqline(const char *mask, const char *reason) +void rageircd_SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) { return; @@ -677,7 +677,7 @@ void rageircd_cmd_chghost(const char *nick, const char *vhost) send_cmd(ServerName, "VHOST %s %s", nick, vhost); } -void rageircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void rageircd_SendVhost(const char *nick, const char *vIdent, const char *vhost) { send_cmd(s_HostServ, "SVSMODE %s +x", nick); rageircd_cmd_chghost(nick, vhost); @@ -720,7 +720,7 @@ void rageircd_SendSVSMode(User * u, int ac, const char **av) (ac == 2 ? av[1] : "")); } -void rageircd_cmd_squit(const char *servname, const char *message) +void rageircd_SendSquit(const char *servname, const char *message) { send_cmd(NULL, "SQUIT %s :%s", servname, message); } @@ -1125,7 +1125,7 @@ void rageircd_cmd_nick(const char *nick, const char *name, const char *modes) send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick, (long int) time(NULL), ServiceUser, ServiceHost, ServerName, modes, name); - rageircd_cmd_sqline(nick, "Reserved for services"); + rageircd_SendSQLine(nick, "Reserved for services"); } /* EVENT : OS */ @@ -1189,7 +1189,7 @@ void rageircd_SendClientIntroduction(const char *nick, const char *user, const c EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "SNICK %s %ld 1 %s %s 0 * %s 0 %s :%s", nick, (long int) time(NULL), user, host, ServerName, modes, real); - rageircd_cmd_sqline(nick, "Reserved for services"); + rageircd_SendSQLine(nick, "Reserved for services"); } /* SVSMODE -b */ @@ -1343,7 +1343,7 @@ void rageircd_cmd_release_svshold(const char *nick) send_cmd(ServerName, "SVSHOLD %s 0", nick); } -void rageircd_cmd_svsnick(const char *source, const char *guest, time_t when) +void rageircd_SendForceNickChange(const char *source, const char *guest, time_t when) { if (!source || !guest) { return; @@ -1359,7 +1359,7 @@ void rageircd_SendGuestNick(const char *nick, const char *user, const char *host } -void rageircd_cmd_svso(const char *source, const char *nick, const char *flag) +void rageircd_SendSVSO(const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1396,7 +1396,7 @@ void rageircd_cmd_svid_umode3(User * u, const char *ts) } /* NICK <newnick> */ -void rageircd_cmd_chg_nick(const char *oldnick, const char *newnick) +void rageircd_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1509,7 +1509,7 @@ void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason) reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - rageircd_cmd_squit(jserver, rbuf); + rageircd_SendSquit(jserver, rbuf); rageircd_cmd_server(jserver, 2, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1605,12 +1605,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(rageircd_cmd_211); pmodule_SendGlobops(rageircd_cmd_global); pmodule_SendGlobops_legacy(rageircd_cmd_global_legacy); - pmodule_cmd_sqline(rageircd_cmd_sqline); - pmodule_cmd_squit(rageircd_cmd_squit); - pmodule_cmd_svso(rageircd_cmd_svso); - pmodule_cmd_chg_nick(rageircd_cmd_chg_nick); - pmodule_cmd_svsnick(rageircd_cmd_svsnick); - pmodule_cmd_vhost_on(rageircd_cmd_vhost_on); + pmodule_SendSQLine(rageircd_cmd_sqline); + pmodule_SendSquit(rageircd_cmd_squit); + pmodule_SendSVSO(rageircd_cmd_svso); + pmodule_SendChangeBotNick(rageircd_cmd_chg_nick); + pmodule_SendForceNickChange(rageircd_cmd_svsnick); + pmodule_SendVhost(rageircd_cmd_vhost_on); pmodule_cmd_connect(rageircd_cmd_connect); pmodule_cmd_svshold(rageircd_cmd_svshold); pmodule_cmd_release_svshold(rageircd_cmd_release_svshold); diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h index 985091ea4..7ba3493ce 100644 --- a/src/protocol/obsolete/rageircd.h +++ b/src/protocol/obsolete/rageircd.h @@ -85,12 +85,12 @@ void rageircd_cmd_243(const char *buf); void rageircd_cmd_211(const char *buf); void rageircd_SendGlobops(const char *source, const char *buf); void rageircd_SendGlobops_legacy(const char *source, const char *fmt); -void rageircd_cmd_sqline(const char *mask, const char *reason); -void rageircd_cmd_squit(const char *servname, const char *message); -void rageircd_cmd_svso(const char *source, const char *nick, const char *flag); -void rageircd_cmd_chg_nick(const char *oldnick, const char *newnick); -void rageircd_cmd_svsnick(const char *source, const char *guest, time_t when); -void rageircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void rageircd_SendSQLine(const char *mask, const char *reason); +void rageircd_SendSquit(const char *servname, const char *message); +void rageircd_SendSVSO(const char *source, const char *nick, const char *flag); +void rageircd_SendChangeBotNick(const char *oldnick, const char *newnick); +void rageircd_SendForceNickChange(const char *source, const char *guest, time_t when); +void rageircd_SendVhost(const char *nick, const char *vIdent, const char *vhost); void rageircd_cmd_connect(int servernum); void rageircd_cmd_svshold(const char *nick); void rageircd_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c index 8078596a4..8b4b006f4 100644 --- a/src/protocol/obsolete/solidircd.c +++ b/src/protocol/obsolete/solidircd.c @@ -727,7 +727,7 @@ int anope_event_vs(const char *source, int ac, const char **av) } /* SQLINE */ -void solidircd_cmd_sqline(const char *mask, const char *reason) +void solidircd_SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) { return; @@ -865,7 +865,7 @@ void solidircd_SendSVSMode(User * u, int ac, const char **av) * parv[1] = server name * parv[2] = comment */ -void solidircd_cmd_squit(const char *servname, const char *message) +void solidircd_SendSquit(const char *servname, const char *message) { send_cmd(NULL, "SQUIT %s :%s", servname, message); } @@ -1252,7 +1252,7 @@ void solidircd_cmd_nick(const char *nick, const char *name, const char *modes) send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, (long int) time(NULL), modes, ServiceUser, ServiceHost, ServerName, name); - solidircd_cmd_sqline(nick, "Reserved for services"); + solidircd_SendSQLine(nick, "Reserved for services"); } void solidircd_SendKick(const char *source, const char *chan, const char *user, const char *buf) @@ -1339,7 +1339,7 @@ void solidircd_SendClientIntroduction(const char *nick, const char *user, const EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, (long int) time(NULL), modes, user, host, ServerName, real); - solidircd_cmd_sqline(nick, "Reserved for services"); + solidircd_SendSQLine(nick, "Reserved for services"); } /* SVSNICK */ @@ -1348,7 +1348,7 @@ void solidircd_SendClientIntroduction(const char *nick, const char *user, const * parv[2] = new nickname * parv[3] = timestamp */ -void solidircd_cmd_svsnick(const char *source, const char *guest, time_t when) +void solidircd_SendForceNickChange(const char *source, const char *guest, time_t when) { if (!source || !guest) { return; @@ -1363,7 +1363,7 @@ void solidircd_SendGuestNick(const char *nick, const char *user, const char *hos (long int) time(NULL), modes, user, host, ServerName, real); } -void solidircd_cmd_svso(const char *source, const char *nick, const char *flag) +void solidircd_SendSVSO(const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1377,7 +1377,7 @@ void solidircd_cmd_chghost(const char *nick, const char *vhost) } -void solidircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void solidircd_SendVhost(const char *nick, const char *vIdent, const char *vhost) { send_cmd(s_HostServ, "SVSMODE %s +v", nick); solidircd_cmd_chghost(nick, vhost); @@ -1422,7 +1422,7 @@ void solidircd_cmd_svid_umode3(User * u, const char *ts) } /* NICK <newnick> */ -void solidircd_cmd_chg_nick(const char *oldnick, const char *newnick) +void solidircd_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1542,7 +1542,7 @@ void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - solidircd_cmd_squit(jserver, rbuf); + solidircd_SendSquit(jserver, rbuf); solidircd_cmd_server(jserver, 2, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1638,12 +1638,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(solidircd_cmd_211); pmodule_SendGlobops(solidircd_cmd_global); pmodule_SendGlobops_legacy(solidircd_cmd_global_legacy); - pmodule_cmd_sqline(solidircd_cmd_sqline); - pmodule_cmd_squit(solidircd_cmd_squit); - pmodule_cmd_svso(solidircd_cmd_svso); - pmodule_cmd_chg_nick(solidircd_cmd_chg_nick); - pmodule_cmd_svsnick(solidircd_cmd_svsnick); - pmodule_cmd_vhost_on(solidircd_cmd_vhost_on); + pmodule_SendSQLine(solidircd_cmd_sqline); + pmodule_SendSquit(solidircd_cmd_squit); + pmodule_SendSVSO(solidircd_cmd_svso); + pmodule_SendChangeBotNick(solidircd_cmd_chg_nick); + pmodule_SendForceNickChange(solidircd_cmd_svsnick); + pmodule_SendVhost(solidircd_cmd_vhost_on); pmodule_cmd_connect(solidircd_cmd_connect); pmodule_cmd_svshold(solidircd_cmd_svshold); pmodule_cmd_release_svshold(solidircd_cmd_release_svshold); diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h index 84b9b00e6..fdccd0876 100644 --- a/src/protocol/obsolete/solidircd.h +++ b/src/protocol/obsolete/solidircd.h @@ -109,12 +109,12 @@ void solidircd_cmd_243(const char *buf); void solidircd_cmd_211(const char *buf); void solidircd_SendGlobops(const char *source, const char *buf); void solidircd_SendGlobops_legacy(const char *source, const char *fmt); -void solidircd_cmd_sqline(const char *mask, const char *reason); -void solidircd_cmd_squit(const char *servname, const char *message); -void solidircd_cmd_svso(const char *source, const char *nick, const char *flag); -void solidircd_cmd_chg_nick(const char *oldnick, const char *newnick); -void solidircd_cmd_svsnick(const char *source, const char *guest, time_t when); -void solidircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void solidircd_SendSQLine(const char *mask, const char *reason); +void solidircd_SendSquit(const char *servname, const char *message); +void solidircd_SendSVSO(const char *source, const char *nick, const char *flag); +void solidircd_SendChangeBotNick(const char *oldnick, const char *newnick); +void solidircd_SendForceNickChange(const char *source, const char *guest, time_t when); +void solidircd_SendVhost(const char *nick, const char *vIdent, const char *vhost); void solidircd_cmd_connect(int servernum); void solidircd_cmd_svshold(const char *nick); void solidircd_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c index 8e1dfe630..a467d7447 100644 --- a/src/protocol/obsolete/ultimate3.c +++ b/src/protocol/obsolete/ultimate3.c @@ -663,7 +663,7 @@ void moduleAddIRCDMsgs(void) { /* *INDENT-ON* */ -void ultimate3_cmd_sqline(const char *mask, const char *reason) +void ultimate3_SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) { return; @@ -721,7 +721,7 @@ void ultimate3_SendVhostDel(User * u) notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar); } -void ultimate3_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void ultimate3_SendVhost(const char *nick, const char *vIdent, const char *vhost) { send_cmd(s_HostServ, "SVSMODE %s +x", nick); send_cmd(ServerName, "SETHOST %s %s", nick, vhost); @@ -1059,7 +1059,7 @@ void ultimate3_cmd_nick(const char *nick, const char *name, const char *modes) send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick, (long int) time(NULL), modes, ServiceUser, ServiceHost, ServerName, name); - ultimate3_cmd_sqline(nick, "Reserved for services"); + ultimate3_SendSQLine(nick, "Reserved for services"); } void ultimate3_SendGuestNick(const char *nick, const char *user, const char *host, @@ -1084,7 +1084,7 @@ void ultimate3_SendClientIntroduction(const char *nick, const char *user, const EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "CLIENT %s 1 %ld %s + %s %s * %s 0 0 :%s", nick, (long int) time(NULL), modes, user, host, ServerName, real); - ultimate3_cmd_sqline(nick, "Reserved for services"); + ultimate3_SendSQLine(nick, "Reserved for services"); } void ultimate3_SendKick(const char *source, const char *chan, const char *user, const char *buf) @@ -1387,7 +1387,7 @@ void ultimate3_SendGlobops(const char *source, const char *buf) } /* SQUIT */ -void ultimate3_cmd_squit(const char *servname, const char *message) +void ultimate3_SendSquit(const char *servname, const char *message) { if (!servname || !message) { return; @@ -1397,7 +1397,7 @@ void ultimate3_cmd_squit(const char *servname, const char *message) } /* SVSO */ -void ultimate3_cmd_svso(const char *source, const char *nick, const char *flag) +void ultimate3_SendSVSO(const char *source, const char *nick, const char *flag) { if (!source || !nick || !flag) { return; @@ -1407,7 +1407,7 @@ void ultimate3_cmd_svso(const char *source, const char *nick, const char *flag) } /* NICK <newnick> */ -void ultimate3_cmd_chg_nick(const char *oldnick, const char *newnick) +void ultimate3_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1417,7 +1417,7 @@ void ultimate3_cmd_chg_nick(const char *oldnick, const char *newnick) } /* SVSNICK */ -void ultimate3_cmd_svsnick(const char *source, const char *guest, time_t when) +void ultimate3_SendForceNickChange(const char *source, const char *guest, time_t when) { if (!source || !guest) { return; @@ -1650,7 +1650,7 @@ void ultimate3_cmd_jupe(const char *jserver, const char *who, const char *reason reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - ultimate3_cmd_squit(jserver, rbuf); + ultimate3_SendSquit(jserver, rbuf); ultimate3_cmd_server(jserver, 2, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1746,12 +1746,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(ultimate3_cmd_211); pmodule_SendGlobops(ultimate3_cmd_global); pmodule_SendGlobops_legacy(ultimate3_cmd_global_legacy); - pmodule_cmd_sqline(ultimate3_cmd_sqline); - pmodule_cmd_squit(ultimate3_cmd_squit); - pmodule_cmd_svso(ultimate3_cmd_svso); - pmodule_cmd_chg_nick(ultimate3_cmd_chg_nick); - pmodule_cmd_svsnick(ultimate3_cmd_svsnick); - pmodule_cmd_vhost_on(ultimate3_cmd_vhost_on); + pmodule_SendSQLine(ultimate3_cmd_sqline); + pmodule_SendSquit(ultimate3_cmd_squit); + pmodule_SendSVSO(ultimate3_cmd_svso); + pmodule_SendChangeBotNick(ultimate3_cmd_chg_nick); + pmodule_SendForceNickChange(ultimate3_cmd_svsnick); + pmodule_SendVhost(ultimate3_cmd_vhost_on); pmodule_cmd_connect(ultimate3_cmd_connect); pmodule_cmd_svshold(ultimate3_cmd_svshold); pmodule_cmd_release_svshold(ultimate3_cmd_release_svshold); diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h index 17dc30099..db9dcae15 100644 --- a/src/protocol/obsolete/ultimate3.h +++ b/src/protocol/obsolete/ultimate3.h @@ -95,12 +95,12 @@ void ultimate3_cmd_243(const char *buf); void ultimate3_cmd_211(const char *buf); void ultimate3_SendGlobops(const char *source, const char *buf); void ultimate3_SendGlobops_legacy(const char *source, const char *fmt); -void ultimate3_cmd_sqline(const char *mask, const char *reason); -void ultimate3_cmd_squit(const char *servname, const char *message); -void ultimate3_cmd_svso(const char *source, const char *nick, const char *flag); -void ultimate3_cmd_chg_nick(const char *oldnick, const char *newnick); -void ultimate3_cmd_svsnick(const char *source, const char *guest, time_t when); -void ultimate3_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void ultimate3_SendSQLine(const char *mask, const char *reason); +void ultimate3_SendSquit(const char *servname, const char *message); +void ultimate3_SendSVSO(const char *source, const char *nick, const char *flag); +void ultimate3_SendChangeBotNick(const char *oldnick, const char *newnick); +void ultimate3_SendForceNickChange(const char *source, const char *guest, time_t when); +void ultimate3_SendVhost(const char *nick, const char *vIdent, const char *vhost); void ultimate3_cmd_connect(int servernum); void ultimate3_cmd_svshold(const char *nick); void ultimate3_cmd_release_svshold(const char *nick); diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c index bafe8cad7..bcbd37e14 100644 --- a/src/protocol/obsolete/viagra.c +++ b/src/protocol/obsolete/viagra.c @@ -742,7 +742,7 @@ void moduleAddIRCDMsgs(void) { /* SQLINE */ -void viagra_cmd_sqline(const char *mask, const char *reason) +void viagra_SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) { return; @@ -813,7 +813,7 @@ void viagra_SendVhostDel(User * u) notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, ircd->vhostchar); } -void viagra_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void viagra_SendVhost(const char *nick, const char *vIdent, const char *vhost) { if (vIdent) { send_cmd(NULL, "CHGIDENT %s %s", nick, vIdent); @@ -916,7 +916,7 @@ void viagra_SendSVSMode(User * u, int ac, const char **av) (ac == 2 ? av[1] : "")); } -void viagra_cmd_squit(const char *servname, const char *message) +void viagra_SendSquit(const char *servname, const char *message) { send_cmd(NULL, "SQUIT %s :%s", servname, message); } @@ -1329,7 +1329,7 @@ void viagra_SendClientIntroduction(const char *nick, const char *user, const cha EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, (long int) time(NULL), modes, user, host, ServerName, real); - viagra_cmd_sqline(nick, "Reserved for services"); + viagra_SendSQLine(nick, "Reserved for services"); } void viagra_SendKick(const char *source, const char *chan, const char *user, const char *buf) @@ -1347,7 +1347,7 @@ void viagra_cmd_nick(const char *nick, const char *name, const char *modes) send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, (long int) time(NULL), modes, ServiceUser, ServiceHost, ServerName, name); - viagra_cmd_sqline(nick, "Reserved for services"); + viagra_SendSQLine(nick, "Reserved for services"); } void viagra_cmd_372(const char *source, const char *msg) @@ -1406,7 +1406,7 @@ void viagra_cmd_release_svshold(const char *nick) } /* SVSNICK */ -void viagra_cmd_svsnick(const char *source, const char *guest, time_t when) +void viagra_SendForceNickChange(const char *source, const char *guest, time_t when) { if (!source || !guest) { return; @@ -1421,7 +1421,7 @@ void viagra_SendGuestNick(const char *nick, const char *user, const char *host, (long int) time(NULL), modes, user, host, ServerName, real); } -void viagra_cmd_svso(const char *source, const char *nick, const char *flag) +void viagra_SendSVSO(const char *source, const char *nick, const char *flag) { /* Not Supported by this IRCD */ } @@ -1475,7 +1475,7 @@ void viagra_cmd_svid_umode3(User * u, const char *ts) } /* NICK <newnick> */ -void viagra_cmd_chg_nick(const char *oldnick, const char *newnick) +void viagra_SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) { return; @@ -1549,7 +1549,7 @@ void viagra_cmd_jupe(const char *jserver, const char *who, const char *reason) reason ? ": " : "", reason ? reason : ""); if (findserver(servlist, jserver)) - viagra_cmd_squit(jserver, rbuf); + viagra_SendSquit(jserver, rbuf); viagra_cmd_server(jserver, 2, rbuf); new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); } @@ -1645,12 +1645,12 @@ void moduleAddAnopeCmds() pmodule_cmd_211(viagra_cmd_211); pmodule_SendGlobops(viagra_cmd_global); pmodule_SendGlobops_legacy(viagra_cmd_global_legacy); - pmodule_cmd_sqline(viagra_cmd_sqline); - pmodule_cmd_squit(viagra_cmd_squit); - pmodule_cmd_svso(viagra_cmd_svso); - pmodule_cmd_chg_nick(viagra_cmd_chg_nick); - pmodule_cmd_svsnick(viagra_cmd_svsnick); - pmodule_cmd_vhost_on(viagra_cmd_vhost_on); + pmodule_SendSQLine(viagra_cmd_sqline); + pmodule_SendSquit(viagra_cmd_squit); + pmodule_SendSVSO(viagra_cmd_svso); + pmodule_SendChangeBotNick(viagra_cmd_chg_nick); + pmodule_SendForceNickChange(viagra_cmd_svsnick); + pmodule_SendVhost(viagra_cmd_vhost_on); pmodule_cmd_connect(viagra_cmd_connect); pmodule_cmd_svshold(viagra_cmd_svshold); pmodule_cmd_release_svshold(viagra_cmd_release_svshold); diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h index 03fc2403f..0a973ba18 100644 --- a/src/protocol/obsolete/viagra.h +++ b/src/protocol/obsolete/viagra.h @@ -104,12 +104,12 @@ void viagra_cmd_243(const char *buf); void viagra_cmd_211(const char *buf); void viagra_SendGlobops(const char *source, const char *buf); void viagra_SendGlobops_legacy(const char *source, const char *fmt); -void viagra_cmd_sqline(const char *mask, const char *reason); -void viagra_cmd_squit(const char *servname, const char *message); -void viagra_cmd_svso(const char *source, const char *nick, const char *flag); -void viagra_cmd_chg_nick(const char *oldnick, const char *newnick); -void viagra_cmd_svsnick(const char *source, const char *guest, time_t when); -void viagra_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost); +void viagra_SendSQLine(const char *mask, const char *reason); +void viagra_SendSquit(const char *servname, const char *message); +void viagra_SendSVSO(const char *source, const char *nick, const char *flag); +void viagra_SendChangeBotNick(const char *oldnick, const char *newnick); +void viagra_SendForceNickChange(const char *source, const char *guest, time_t when); +void viagra_SendVhost(const char *nick, const char *vIdent, const char *vhost); void viagra_cmd_connect(int servernum); void viagra_cmd_svshold(const char *nick); void viagra_cmd_release_svshold(const char *nick); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 130ae4693..1eda1b033 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -677,7 +677,7 @@ void moduleAddIRCDMsgs(void) /* *INDENT-ON* */ -void RatboxProto::cmd_sqline(const char *mask, const char *reason) +void RatboxProto::SendSQLine(const char *mask, const char *reason) { Uid *ud = find_uid(s_OperServ); send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "RESV * %s :%s", mask, reason); @@ -831,7 +831,7 @@ void RatboxProto::SendClientIntroduction(const char *nick, const char *user, con new_uid(nick, uidbuf); } else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real); - cmd_sqline(nick, "Reserved for services"); + SendSQLine(nick, "Reserved for services"); } void RatboxProto::SendPart(const char *nick, const char *chan, const char *buf) diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index aa3718d70..140f5570e 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -67,8 +67,8 @@ class RatboxProto : public IRCDProto { void SendInvite(const char *, const char *, const char *); void SendPart(const char *, const char *, const char *); void SendGlobops(const char *, const char *); - void cmd_sqline(const char *, const char *); - void cmd_svsnick(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command + void SendSQLine(const char *, const char *); + void SendForceNickChange(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command void cmd_connect(); void cmd_unsgline(const char *); void cmd_sgline(const char *, const char *); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 1b11d1df3..29c862d0c 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -558,7 +558,7 @@ void UnrealIRCdProto::SendClientIntroduction(const char *nick, const char *user, EnforceQlinedNick(nick, s_BotServ); send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host, myIrcd->nickip ? " *" : " ", real); - cmd_sqline(nick, "Reserved for services"); + SendSQLine(nick, "Reserved for services"); } void UnrealIRCdProto::SendKick(const char *source, const char *chan, const char *user, const char *buf) @@ -675,7 +675,7 @@ void unreal_cmd_chgident(const char *nick, const char *vIdent) ** - Unreal will translate this to TKL for us ** */ -void UnrealIRCdProto::cmd_sqline(const char *mask, const char *reason) +void UnrealIRCdProto::SendSQLine(const char *mask, const char *reason) { if (!mask || !reason) return; send_cmd(NULL, "%s %s :%s", send_token("SQLINE", "c"), mask, reason); @@ -687,14 +687,14 @@ void UnrealIRCdProto::cmd_sqline(const char *mask, const char *reason) ** parv[1] = nick ** parv[2] = options */ -void UnrealIRCdProto::cmd_svso(const char *source, const char *nick, const char *flag) +void UnrealIRCdProto::SendSVSO(const char *source, const char *nick, const char *flag) { if (!source || !nick || !flag) return; send_cmd(source, "%s %s %s", send_token("SVSO", "BB"), nick, flag); } /* NICK <newnick> */ -void UnrealIRCdProto::cmd_chg_nick(const char *oldnick, const char *newnick) +void UnrealIRCdProto::SendChangeBotNick(const char *oldnick, const char *newnick) { if (!oldnick || !newnick) return; send_cmd(oldnick, "%s %s %ld", send_token("NICK", "&"), newnick, static_cast<long>(time(NULL))); @@ -702,7 +702,7 @@ void UnrealIRCdProto::cmd_chg_nick(const char *oldnick, const char *newnick) /* Functions that use serval cmd functions */ -void UnrealIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost) +void UnrealIRCdProto::SendVhost(const char *nick, const char *vIdent, const char *vhost) { if (!nick) return; if (vIdent) unreal_cmd_chgident(nick, vIdent); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index faf00a2c2..77a567f21 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -97,10 +97,10 @@ class UnrealIRCdProto : public IRCDProto { void SendBotOp(const char *, const char *); void SendJoin(const char *, const char *, time_t); void SendSQLineDel(const char *); - void cmd_sqline(const char *, const char *); - void cmd_svso(const char *, const char *, const char *); - void cmd_chg_nick(const char *, const char *); - void cmd_vhost_on(const char *, const char *, const char *); + void SendSQLine(const char *, const char *); + void SendSVSO(const char *, const char *, const char *); + void SendChangeBotNick(const char *, const char *); + void SendVhost(const char *, const char *, const char *); void cmd_connect(); void cmd_svshold(const char *); void cmd_release_svshold(const char *); diff --git a/src/servers.c b/src/servers.c index bbfe2f04f..6acbc413f 100644 --- a/src/servers.c +++ b/src/servers.c @@ -421,7 +421,7 @@ void do_squit(const char *source, int ac, const char **av) alog("debug: Sending UNCONNECT SQUIT for %s", s->name); } /* need to fix */ - anope_cmd_squit(s->name, buf); + anope_SendSquit(s->name, buf); } } |