diff options
Diffstat (limited to 'src')
29 files changed, 184 insertions, 184 deletions
diff --git a/src/botserv.c b/src/botserv.c index 8d529af0e..3c3c90497 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -92,7 +92,7 @@ void botserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_BotServ, u->nick, "PING %s", s); + anope_SendCTCP(s_BotServ, u->nick, "PING %s", s); } else { mod_run_cmd(s_BotServ, u, BOTSERV, cmd); } @@ -115,7 +115,7 @@ void botmsgs(User * u, BotInfo * bi, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(bi->nick, u->nick, "PING %s", s); + anope_SendCTCP(bi->nick, u->nick, "PING %s", s); } } @@ -139,7 +139,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* Answer to ping if needed, without breaking the buffer. */ if (!strnicmp(buf, "\1PING", 5)) { - anope_cmd_ctcp(ci->bi->nick, u->nick, "PING %s", buf); + anope_SendCTCP(ci->bi->nick, u->nick, "PING %s", buf); } /* If it's a /me, cut the CTCP part at the beginning (not diff --git a/src/chanserv.c b/src/chanserv.c index 7f3570b3d..686de1dea 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -276,7 +276,7 @@ void chanserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_ChanServ, u->nick, "PING %s", s); + anope_SendCTCP(s_ChanServ, u->nick, "PING %s", s); } else { mod_run_cmd(s_ChanServ, u, CHANSERV, cmd); } diff --git a/src/helpserv.c b/src/helpserv.c index eaadf1566..5a971f48c 100644 --- a/src/helpserv.c +++ b/src/helpserv.c @@ -60,7 +60,7 @@ void helpserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_HelpServ, u->nick, "PING %s", s); + anope_SendCTCP(s_HelpServ, u->nick, "PING %s", s); } else { mod_run_cmd(s_HelpServ, u, HELPSERV, cmd); } diff --git a/src/hostserv.c b/src/hostserv.c index 1f566299a..a8a802a56 100644 --- a/src/hostserv.c +++ b/src/hostserv.c @@ -69,7 +69,7 @@ void hostserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_HostServ, u->nick, "PING %s", s); + anope_SendCTCP(s_HostServ, u->nick, "PING %s", s); } else { if (ircd->vhost) { mod_run_cmd(s_HostServ, u, HOSTSERV, cmd); diff --git a/src/ircd.c b/src/ircd.c index 26f453462..9ae954329 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -322,34 +322,34 @@ void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick ircdproto->SendSVSMode_chan(name, mode, nick); } -void anope_cmd_svid_umode(const char *nick, time_t ts) +void anope_SendSVID(const char *nick, time_t ts) { - ircdproto->cmd_svid_umode(nick, ts); + ircdproto->SendSVID(nick, ts); } -void anope_cmd_nc_change(User *u) +void anope_SendUnregisteredNick(User *u) { - ircdproto->cmd_nc_change(u); + ircdproto->SendUnregisteredNick(u); } -void anope_cmd_svid_umode2(User *u, const char *ts) +void anope_SendSVID2(User *u, const char *ts) { - ircdproto->cmd_svid_umode2(u, ts); + ircdproto->SendSVID2(u, ts); } -void anope_cmd_svid_umode3(User *u, const char *ts) +void anope_SendSVID3(User *u, const char *ts) { - ircdproto->cmd_svid_umode3(u, ts); + ircdproto->SendSVID3(u, ts); } -void anope_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void anope_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { - ircdproto->cmd_svsjoin(source, nick, chan, param); + ircdproto->SendSVSJoin(source, nick, chan, param); } -void anope_cmd_svspart(const char *source, const char *nick, const char *chan) +void anope_SendSVSPart(const char *source, const char *nick, const char *chan) { - ircdproto->cmd_svspart(source, nick, chan); + ircdproto->SendSVSPart(source, nick, chan); } void anope_cmd_swhois(const char *source, const char *who, const char *mask) @@ -383,7 +383,7 @@ int anope_valid_chan(const char *chan) } -void anope_cmd_ctcp(const char *source, const char *dest, const char *fmt, ...) +void anope_SendCTCP(const char *source, const char *dest, const char *fmt, ...) { va_list args; char buf[BUFSIZE] = ""; @@ -392,7 +392,7 @@ void anope_cmd_ctcp(const char *source, const char *dest, const char *fmt, ...) vsnprintf(buf, BUFSIZE - 1, fmt, args); va_end(args); } - ircdproto->cmd_ctcp(source, dest, buf); + ircdproto->SendCTCP(source, dest, buf); } void anope_cmd_numeric(const char *source, int numeric, const char *dest, const char *fmt, ...) diff --git a/src/memoserv.c b/src/memoserv.c index 95145256f..77661a79d 100644 --- a/src/memoserv.c +++ b/src/memoserv.c @@ -63,7 +63,7 @@ void memoserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_MemoServ, u->nick, "PING %s", s); + anope_SendCTCP(s_MemoServ, u->nick, "PING %s", s); } else { if (!u->na && stricmp(cmd, "HELP") != 0) notice_lang(s_MemoServ, u, NICK_NOT_REGISTERED_HELP, diff --git a/src/nickserv.c b/src/nickserv.c index 85ae521f1..94db5aa3c 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -144,7 +144,7 @@ void nickserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_NickServ, u->nick, "PING %s", s); + anope_SendCTCP(s_NickServ, u->nick, "PING %s", s); } else { mod_run_cmd(s_NickServ, u, NICKSERV, cmd); } diff --git a/src/operserv.c b/src/operserv.c index 90e00f553..143ed9a70 100644 --- a/src/operserv.c +++ b/src/operserv.c @@ -141,7 +141,7 @@ void operserv(User * u, char *buf) if (!(s = strtok(NULL, ""))) { s = ""; } - anope_cmd_ctcp(s_OperServ, u->nick, "PING %s", s); + anope_SendCTCP(s_OperServ, u->nick, "PING %s", s); } else { mod_run_cmd(s_OperServ, u, OPERSERV, cmd); } diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 641b500d1..f41f0e8d4 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1000,7 +1000,7 @@ void BahamutIRCdProto::SendGuestNick(const char *nick, const char *user, const c /* SVSMODE +d */ /* sent if svid is something weird */ -void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts) +void BahamutIRCdProto::SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, static_cast<unsigned long>(ts)); } @@ -1008,12 +1008,12 @@ void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void BahamutIRCdProto::cmd_nc_change(User *u) +void BahamutIRCdProto::SendUnregisteredNick(User *u) { common_svsmode(u, "+d", "1"); } -void BahamutIRCdProto::cmd_svid_umode3(User *u, const char *ts) +void BahamutIRCdProto::SendSVID3(User *u, const char *ts) { if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts); else common_svsmode(u, "+r", NULL); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 84045c69f..25e0f972c 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -84,9 +84,9 @@ class BahamutIRCdProto : public IRCDProto { void SendSGLine(const char *, const char *); void SendBanDel(const char *, const char *); void SendSVSMode_chan(const char *, const char *, const char *); - void cmd_svid_umode(const char *, time_t); - void cmd_nc_change(User *); - void cmd_svid_umode3(User *, const char *); + void SendSVID(const char *, time_t); + void SendUnregisteredNick(User *); + void SendSVID3(User *, const char *); void cmd_eob(); void cmd_server(const char *, int, const char *); void set_umode(User *, int, const char **); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 77d84eb93..2dee0c55f 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1304,23 +1304,23 @@ void InspIRCdProto::SendSZLine(const char *mask, const char *reason, const char /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void InspIRCdProto::cmd_nc_change(User *u) +void InspIRCdProto::SendUnregisteredNick(User *u) { common_svsmode(u, "-r", NULL); } /* SVSMODE +r */ -void InspIRCdProto::cmd_svid_umode2(User *u, const char *ts) +void InspIRCdProto::SendSVID2(User *u, const char *ts) { common_svsmode(u, "+r", NULL); } -void InspIRCdProto::cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void InspIRCdProto::SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { send_cmd(source, "SVSJOIN %s %s", nick, chan); } -void InspIRCdProto::cmd_svspart(const char *source, const char *nick, const char *chan) +void InspIRCdProto::SendSVSPart(const char *source, const char *nick, const char *chan) { send_cmd(source, "SVSPART %s %s", nick, chan); } diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index dca5c1e6e..6cabfed2c 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -87,10 +87,10 @@ class InspIRCdProto : public IRCDProto { void SendSVSHOLDDel(const char *); void SendSZLineDel(const char *); void SendSZLine(const char *, const char *, const char *); - void cmd_nc_change(User *); - void cmd_svid_umode2(User *, const char *); - void cmd_svsjoin(const char *, const char *, const char *, const char *); - void cmd_svspart(const char *, const char *, const char *); + void SendUnregisteredNick(User *); + void SendSVID2(User *, const char *); + void SendSVSJoin(const char *, const char *, const char *, const char *); + void SendSVSPart(const char *, const char *, const char *); void cmd_eob(); void cmd_server(const char *, int, const char *); void set_umode(User *, int, const char **); diff --git a/src/protocol/obsolete/hybrid.c b/src/protocol/obsolete/hybrid.c index 7e312c2fa..8f2b5a2da 100644 --- a/src/protocol/obsolete/hybrid.c +++ b/src/protocol/obsolete/hybrid.c @@ -1299,26 +1299,26 @@ void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nic /* SVSMODE +d */ /* sent if svid is something weird */ -void hybrid_cmd_svid_umode(const char *nick, time_t ts) +void hybrid_SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s +d 1", nick); } /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void hybrid_cmd_nc_change(User * u) +void hybrid_SendUnregisteredNick(User * u) { /* not used */ } /* SVSMODE +d */ -void hybrid_cmd_svid_umode2(User * u, const char *ts) +void hybrid_SendSVID2(User * u, const char *ts) { /* not used */ } -void hybrid_cmd_svid_umode3(User * u, const char *ts) +void hybrid_SendSVID3(User * u, const char *ts) { /* not used */ } @@ -1353,12 +1353,12 @@ int anope_event_pass(const char *source, int ac, const char **av) return MOD_CONT; } -void hybrid_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void hybrid_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { /* Not Supported by this IRCD */ } -void hybrid_cmd_svspart(const char *source, const char *nick, const char *chan) +void hybrid_SendSVSPart(const char *source, const char *nick, const char *chan) { /* Not Supported by this IRCD */ } @@ -1432,7 +1432,7 @@ int hybrid_valid_chan(const char *chan) } -void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf) +void hybrid_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1511,19 +1511,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(hybrid_cmd_sgline); pmodule_SendBanDel(hybrid_cmd_unban); pmodule_SendSVSMode_chan(hybrid_cmd_svsmode_chan); - pmodule_cmd_svid_umode(hybrid_cmd_svid_umode); - pmodule_cmd_nc_change(hybrid_cmd_nc_change); - pmodule_cmd_svid_umode2(hybrid_cmd_svid_umode2); - pmodule_cmd_svid_umode3(hybrid_cmd_svid_umode3); - pmodule_cmd_svsjoin(hybrid_cmd_svsjoin); - pmodule_cmd_svspart(hybrid_cmd_svspart); + pmodule_SendSVID(hybrid_cmd_svid_umode); + pmodule_SendUnregisteredNick(hybrid_cmd_nc_change); + pmodule_SendSVID2(hybrid_cmd_svid_umode2); + pmodule_SendSVID3(hybrid_cmd_svid_umode3); + pmodule_SendSVSJoin(hybrid_cmd_svsjoin); + pmodule_SendSVSPart(hybrid_cmd_svspart); pmodule_cmd_swhois(hybrid_cmd_swhois); pmodule_cmd_eob(hybrid_cmd_eob); pmodule_flood_mode_check(hybrid_flood_mode_check); pmodule_cmd_jupe(hybrid_cmd_jupe); pmodule_valid_nick(hybrid_valid_nick); pmodule_valid_chan(hybrid_valid_chan); - pmodule_cmd_ctcp(hybrid_cmd_ctcp); + pmodule_SendCTCP(hybrid_cmd_ctcp); pmodule_set_umode(hybrid_set_umode); } diff --git a/src/protocol/obsolete/hybrid.h b/src/protocol/obsolete/hybrid.h index 3269a70e9..ad00289d9 100644 --- a/src/protocol/obsolete/hybrid.h +++ b/src/protocol/obsolete/hybrid.h @@ -102,15 +102,15 @@ void hybrid_SendSZLine(const char *mask, const char *reason, const char *whom); void hybrid_SendSGLine(const char *mask, const char *reason); void hybrid_SendBanDel(const char *name, const char *nick); void hybrid_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void hybrid_cmd_svid_umode(const char *nick, time_t ts); -void hybrid_cmd_nc_change(User * u); -void hybrid_cmd_svid_umode2(User * u, const char *ts); -void hybrid_cmd_svid_umode3(User * u, const char *ts); +void hybrid_SendSVID(const char *nick, time_t ts); +void hybrid_SendUnregisteredNick(User * u); +void hybrid_SendSVID2(User * u, const char *ts); +void hybrid_SendSVID3(User * u, const char *ts); void hybrid_cmd_eob(); int hybrid_flood_mode_check(const char *value); void hybrid_cmd_jupe(const char *jserver, const char *who, const char *reason); int hybrid_valid_nick(const char *nick); -void hybrid_cmd_ctcp(const char *source, const char *dest, const char *buf); +void hybrid_SendCTCP(const char *source, const char *dest, const char *buf); class HybridIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/plexus3.c b/src/protocol/obsolete/plexus3.c index 69732bdb6..c1bedc9be 100644 --- a/src/protocol/obsolete/plexus3.c +++ b/src/protocol/obsolete/plexus3.c @@ -1542,7 +1542,7 @@ plexus_SendSVSMode_chan (const char *name, const char *mode, const char *nick) /* SVSMODE +d */ /* sent if svid is something weird */ void -plexus_cmd_svid_umode (const char *nick, time_t ts) +plexus_SendSVID (const char *nick, time_t ts) { send_cmd (ServerName, "ENCAP * SVSMODE %s %lu +d 1", nick, (unsigned long int) ts); @@ -1551,20 +1551,20 @@ plexus_cmd_svid_umode (const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ void -plexus_cmd_nc_change (User * u) +plexus_SendUnregisteredNick (User * u) { common_svsmode (u, "+d", "1"); } /* SVSMODE +d */ void -plexus_cmd_svid_umode2 (User * u, const char *ts) +plexus_SendSVID2 (User * u, const char *ts) { /* not used */ } void -plexus_cmd_svid_umode3 (User * u, const char *ts) +plexus_SendSVID3 (User * u, const char *ts) { char modes[512]; @@ -1620,13 +1620,13 @@ anope_event_pass (const char *source, int ac, const char **av) } void -plexus_cmd_svsjoin (const char *source, const char *nick, const char *chan, const char *param) +plexus_SendSVSJoin (const char *source, const char *nick, const char *chan, const char *param) { send_cmd(ServerName, "ENCAP * SVSJOIN %s %s", nick, chan); } void -plexus_cmd_svspart (const char *source, const char *nick, const char *chan) +plexus_SendSVSPart (const char *source, const char *nick, const char *chan) { send_cmd(ServerName, "ENCAP * SVSPART %s %s", nick, chan); } @@ -1712,7 +1712,7 @@ plexus_valid_chan (const char *chan) void -plexus_cmd_ctcp (const char *source, const char *dest, const char *buf) +plexus_SendCTCP (const char *source, const char *dest, const char *buf) { char *s; @@ -1795,19 +1795,19 @@ moduleAddAnopeCmds () pmodule_SendSGLine (plexus_cmd_sgline); pmodule_SendBanDel (plexus_cmd_unban); pmodule_SendSVSMode_chan (plexus_cmd_svsmode_chan); - pmodule_cmd_svid_umode (plexus_cmd_svid_umode); - pmodule_cmd_nc_change (plexus_cmd_nc_change); - pmodule_cmd_svid_umode2 (plexus_cmd_svid_umode2); - pmodule_cmd_svid_umode3 (plexus_cmd_svid_umode3); - pmodule_cmd_svsjoin (plexus_cmd_svsjoin); - pmodule_cmd_svspart (plexus_cmd_svspart); + pmodule_SendSVID (plexus_cmd_svid_umode); + pmodule_SendUnregisteredNick (plexus_cmd_nc_change); + pmodule_SendSVID2 (plexus_cmd_svid_umode2); + pmodule_SendSVID3 (plexus_cmd_svid_umode3); + pmodule_SendSVSJoin (plexus_cmd_svsjoin); + pmodule_SendSVSPart (plexus_cmd_svspart); pmodule_cmd_swhois (plexus_cmd_swhois); pmodule_cmd_eob (plexus_cmd_eob); pmodule_flood_mode_check (plexus_flood_mode_check); pmodule_cmd_jupe (plexus_cmd_jupe); pmodule_valid_nick (plexus_valid_nick); pmodule_valid_chan (plexus_valid_chan); - pmodule_cmd_ctcp (plexus_cmd_ctcp); + pmodule_SendCTCP (plexus_cmd_ctcp); pmodule_set_umode (plexus_set_umode); } diff --git a/src/protocol/obsolete/plexus3.h b/src/protocol/obsolete/plexus3.h index fdc6b2d2b..c01df7f0a 100644 --- a/src/protocol/obsolete/plexus3.h +++ b/src/protocol/obsolete/plexus3.h @@ -98,15 +98,15 @@ void plexus_SendSZLine(const char *mask, const char *reason, const char *whom); void plexus_SendSGLine(const char *mask, const char *reason); void plexus_SendBanDel(const char *name, const char *nick); void plexus_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void plexus_cmd_svid_umode(const char *nick, time_t ts); -void plexus_cmd_nc_change(User * u); -void plexus_cmd_svid_umode2(User * u, const char *ts); -void plexus_cmd_svid_umode3(User * u, const char *ts); +void plexus_SendSVID(const char *nick, time_t ts); +void plexus_SendUnregisteredNick(User * u); +void plexus_SendSVID2(User * u, const char *ts); +void plexus_SendSVID3(User * u, const char *ts); void plexus_cmd_eob(); int plexus_flood_mode_check(const char *value); void plexus_cmd_jupe(const char *jserver, const char *who, const char *reason); int plexus_valid_nick(const char *nick); -void plexus_cmd_ctcp(const char *source, const char *dest, const char *buf); +void plexus_SendCTCP(const char *source, const char *dest, const char *buf); class PleXusIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/ptlink.c b/src/protocol/obsolete/ptlink.c index 4b84ceed4..0b6fc578e 100644 --- a/src/protocol/obsolete/ptlink.c +++ b/src/protocol/obsolete/ptlink.c @@ -1503,26 +1503,26 @@ void ptlink_SendSVSO(const char *source, const char *nick, const char *flag) /* SVSMODE +d */ /* sent if svid is something weird */ -void ptlink_cmd_svid_umode(const char *nick, time_t ts) +void ptlink_SendSVID(const char *nick, time_t ts) { /* Not Supported by this ircd */ } /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void ptlink_cmd_nc_change(User * u) +void ptlink_SendUnregisteredNick(User * u) { /* Not Supported by this ircd */ } /* SVSMODE +d */ /* sent if svid is something weird */ -void ptlink_cmd_svid_umode2(User * u, const char *ts) +void ptlink_SendSVID2(User * u, const char *ts) { common_svsmode(u, "+r", NULL); } -void ptlink_cmd_svid_umode3(User * u, const char *ts) +void ptlink_SendSVID3(User * u, const char *ts) { /* Bahamuts have this extra one, since they can check on even nick changes */ } @@ -1550,7 +1550,7 @@ void ptlink_SendChangeBotNick(const char *oldnick, const char *newnick) parv[2] = channels list :OperServ SVSJOIN Trystan #Admin */ -void ptlink_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void ptlink_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { send_cmd(source, "SVSJOIN %s %s", nick, chan); } @@ -1562,7 +1562,7 @@ void ptlink_cmd_svsjoin(const char *source, const char *nick, const char *chan, parv[2] = channels list e.g.: :ChanServ SVSPART mynick 4163321 #Chan1,#Chan2 */ -void ptlink_cmd_svspart(const char *source, const char *nick, const char *chan) +void ptlink_SendSVSPart(const char *source, const char *nick, const char *chan) { send_cmd(source, "SVSPART %s :%s", nick, chan); } @@ -1661,7 +1661,7 @@ int ptlink_valid_chan(const char *cahn) } -void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf) +void ptlink_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1740,19 +1740,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(ptlink_cmd_sgline); pmodule_SendBanDel(ptlink_cmd_unban); pmodule_SendSVSMode_chan(ptlink_cmd_svsmode_chan); - pmodule_cmd_svid_umode(ptlink_cmd_svid_umode); - pmodule_cmd_nc_change(ptlink_cmd_nc_change); - pmodule_cmd_svid_umode2(ptlink_cmd_svid_umode2); - pmodule_cmd_svid_umode3(ptlink_cmd_svid_umode3); - pmodule_cmd_svsjoin(ptlink_cmd_svsjoin); - pmodule_cmd_svspart(ptlink_cmd_svspart); + pmodule_SendSVID(ptlink_cmd_svid_umode); + pmodule_SendUnregisteredNick(ptlink_cmd_nc_change); + pmodule_SendSVID2(ptlink_cmd_svid_umode2); + pmodule_SendSVID3(ptlink_cmd_svid_umode3); + pmodule_SendSVSJoin(ptlink_cmd_svsjoin); + pmodule_SendSVSPart(ptlink_cmd_svspart); pmodule_cmd_swhois(ptlink_cmd_swhois); pmodule_cmd_eob(ptlink_cmd_eob); pmodule_flood_mode_check(ptlink_flood_mode_check); pmodule_cmd_jupe(ptlink_cmd_jupe); pmodule_valid_nick(ptlink_valid_nick); pmodule_valid_chan(ptlink_valid_chan); - pmodule_cmd_ctcp(ptlink_cmd_ctcp); + pmodule_SendCTCP(ptlink_cmd_ctcp); pmodule_set_umode(ptlink_set_umode); } diff --git a/src/protocol/obsolete/ptlink.h b/src/protocol/obsolete/ptlink.h index 6393f3605..5e1881bfe 100644 --- a/src/protocol/obsolete/ptlink.h +++ b/src/protocol/obsolete/ptlink.h @@ -137,15 +137,15 @@ void ptlink_SendSZLine(const char *mask, const char *reason, const char *whom); void ptlink_SendSGLine(const char *mask, const char *reason); void ptlink_SendBanDel(const char *name, const char *nick); void ptlink_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void ptlink_cmd_svid_umode(const char *nick, time_t ts); -void ptlink_cmd_nc_change(User * u); -void ptlink_cmd_svid_umode2(User * u, const char *ts); -void ptlink_cmd_svid_umode3(User * u, const char *ts); +void ptlink_SendSVID(const char *nick, time_t ts); +void ptlink_SendUnregisteredNick(User * u); +void ptlink_SendSVID2(User * u, const char *ts); +void ptlink_SendSVID3(User * u, const char *ts); void ptlink_cmd_eob(); int ptlink_flood_mode_check(const char *value); void ptlink_cmd_jupe(const char *jserver, const char *who, const char *reason); int ptlink_valid_nick(const char *nick); -void ptlink_cmd_ctcp(const char *source, const char *dest, const char *buf); +void ptlink_SendCTCP(const char *source, const char *dest, const char *buf); class PTlinkProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/rageircd.c b/src/protocol/obsolete/rageircd.c index 7ba0fbb79..769c46518 100644 --- a/src/protocol/obsolete/rageircd.c +++ b/src/protocol/obsolete/rageircd.c @@ -1367,7 +1367,7 @@ void rageircd_SendSVSO(const char *source, const char *nick, const char *flag) /* SVSMODE +d */ /* sent if svid is something weird */ -void rageircd_cmd_svid_umode(const char *nick, time_t ts) +void rageircd_SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, (unsigned long int) ts); @@ -1375,18 +1375,18 @@ void rageircd_cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void rageircd_cmd_nc_change(User * u) +void rageircd_SendUnregisteredNick(User * u) { common_svsmode(u, "+d", "1"); } /* SVSMODE +d */ -void rageircd_cmd_svid_umode2(User * u, const char *ts) +void rageircd_SendSVID2(User * u, const char *ts) { /* not used by bahamut ircds */ } -void rageircd_cmd_svid_umode3(User * u, const char *ts) +void rageircd_SendSVID3(User * u, const char *ts) { if (u->svid != u->timestamp) { common_svsmode(u, "+rd", ts); @@ -1456,12 +1456,12 @@ int anope_event_sqline(const char *source, int ac, const char **av) return MOD_CONT; } -void rageircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void rageircd_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { /* Find no reference to it in the code and docs */ } -void rageircd_cmd_svspart(const char *source, const char *nick, const char *chan) +void rageircd_SendSVSPart(const char *source, const char *nick, const char *chan) { /* Find no reference to it in the code and docs */ } @@ -1541,7 +1541,7 @@ int rageircd_valid_chan(const char *chan) } -void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf) +void rageircd_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1620,19 +1620,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(rageircd_cmd_sgline); pmodule_SendBanDel(rageircd_cmd_unban); pmodule_SendSVSMode_chan(rageircd_cmd_svsmode_chan); - pmodule_cmd_svid_umode(rageircd_cmd_svid_umode); - pmodule_cmd_nc_change(rageircd_cmd_nc_change); - pmodule_cmd_svid_umode2(rageircd_cmd_svid_umode2); - pmodule_cmd_svid_umode3(rageircd_cmd_svid_umode3); - pmodule_cmd_svsjoin(rageircd_cmd_svsjoin); - pmodule_cmd_svspart(rageircd_cmd_svspart); + pmodule_SendSVID(rageircd_cmd_svid_umode); + pmodule_SendUnregisteredNick(rageircd_cmd_nc_change); + pmodule_SendSVID2(rageircd_cmd_svid_umode2); + pmodule_SendSVID3(rageircd_cmd_svid_umode3); + pmodule_SendSVSJoin(rageircd_cmd_svsjoin); + pmodule_SendSVSPart(rageircd_cmd_svspart); pmodule_cmd_swhois(rageircd_cmd_swhois); pmodule_cmd_eob(rageircd_cmd_eob); pmodule_flood_mode_check(rageircd_flood_mode_check); pmodule_cmd_jupe(rageircd_cmd_jupe); pmodule_valid_nick(rageircd_valid_nick); pmodule_valid_chan(rageircd_valid_chan); - pmodule_cmd_ctcp(rageircd_cmd_ctcp); + pmodule_SendCTCP(rageircd_cmd_ctcp); pmodule_set_umode(rageircd_set_umode); } diff --git a/src/protocol/obsolete/rageircd.h b/src/protocol/obsolete/rageircd.h index ade24afd3..7145e180f 100644 --- a/src/protocol/obsolete/rageircd.h +++ b/src/protocol/obsolete/rageircd.h @@ -100,15 +100,15 @@ void rageircd_SendSZLine(const char *mask, const char *reason, const char *whom) void rageircd_SendSGLine(const char *mask, const char *reason); void rageircd_SendBanDel(const char *name, const char *nick); void rageircd_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void rageircd_cmd_svid_umode(const char *nick, time_t ts); -void rageircd_cmd_nc_change(User * u); -void rageircd_cmd_svid_umode2(User * u, const char *ts); -void rageircd_cmd_svid_umode3(User * u, const char *ts); +void rageircd_SendSVID(const char *nick, time_t ts); +void rageircd_SendUnregisteredNick(User * u); +void rageircd_SendSVID2(User * u, const char *ts); +void rageircd_SendSVID3(User * u, const char *ts); void rageircd_cmd_eob(); int rageircd_flood_mode_check(const char *value); void rageircd_cmd_jupe(const char *jserver, const char *who, const char *reason); int rageircd_valid_nick(const char *nick); -void rageircd_cmd_ctcp(const char *source, const char *dest, const char *buf); +void rageircd_SendCTCP(const char *source, const char *dest, const char *buf); class RageIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/solidircd.c b/src/protocol/obsolete/solidircd.c index 60b198601..a3540bc11 100644 --- a/src/protocol/obsolete/solidircd.c +++ b/src/protocol/obsolete/solidircd.c @@ -1391,7 +1391,7 @@ void solidircd_SendVhostDel(User * u) /* SVSMODE +d */ /* sent if svid is something weird */ -void solidircd_cmd_svid_umode(const char *nick, time_t ts) +void solidircd_SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, (unsigned long int) ts); @@ -1400,19 +1400,19 @@ void solidircd_cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void solidircd_cmd_nc_change(User * u) +void solidircd_SendUnregisteredNick(User * u) { common_svsmode(u, "+d", "1"); } /* SVSMODE +d */ -void solidircd_cmd_svid_umode2(User * u, const char *ts) +void solidircd_SendSVID2(User * u, const char *ts) { /* not used by bahamut ircds */ } -void solidircd_cmd_svid_umode3(User * u, const char *ts) +void solidircd_SendSVID3(User * u, const char *ts) { if (u->svid != u->timestamp) { common_svsmode(u, "+rd", ts); @@ -1462,12 +1462,12 @@ int anope_event_pass(const char *source, int ac, const char **av) return MOD_CONT; } -void solidircd_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void solidircd_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { /* Can not find any reference to these in Bahamut */ } -void solidircd_cmd_svspart(const char *source, const char *nick, const char *chan) +void solidircd_SendSVSPart(const char *source, const char *nick, const char *chan) { /* Can not find any reference to these in Bahamut */ } @@ -1574,7 +1574,7 @@ int solidircd_valid_chan(const char *chan) } -void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf) +void solidircd_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1653,19 +1653,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(solidircd_cmd_sgline); pmodule_SendBanDel(solidircd_cmd_unban); pmodule_SendSVSMode_chan(solidircd_cmd_svsmode_chan); - pmodule_cmd_svid_umode(solidircd_cmd_svid_umode); - pmodule_cmd_nc_change(solidircd_cmd_nc_change); - pmodule_cmd_svid_umode2(solidircd_cmd_svid_umode2); - pmodule_cmd_svid_umode3(solidircd_cmd_svid_umode3); - pmodule_cmd_svsjoin(solidircd_cmd_svsjoin); - pmodule_cmd_svspart(solidircd_cmd_svspart); + pmodule_SendSVID(solidircd_cmd_svid_umode); + pmodule_SendUnregisteredNick(solidircd_cmd_nc_change); + pmodule_SendSVID2(solidircd_cmd_svid_umode2); + pmodule_SendSVID3(solidircd_cmd_svid_umode3); + pmodule_SendSVSJoin(solidircd_cmd_svsjoin); + pmodule_SendSVSPart(solidircd_cmd_svspart); pmodule_cmd_swhois(solidircd_cmd_swhois); pmodule_cmd_eob(solidircd_cmd_eob); pmodule_flood_mode_check(solidircd_flood_mode_check); pmodule_cmd_jupe(solidircd_cmd_jupe); pmodule_valid_nick(solidircd_valid_nick); pmodule_valid_chan(solidircd_valid_chan); - pmodule_cmd_ctcp(solidircd_cmd_ctcp); + pmodule_SendCTCP(solidircd_cmd_ctcp); pmodule_set_umode(solidircd_set_umode); } diff --git a/src/protocol/obsolete/solidircd.h b/src/protocol/obsolete/solidircd.h index ea770c259..b8e5d4dae 100644 --- a/src/protocol/obsolete/solidircd.h +++ b/src/protocol/obsolete/solidircd.h @@ -124,15 +124,15 @@ void solidircd_SendSZLine(const char *mask, const char *reason, const char *whom void solidircd_SendSGLine(const char *mask, const char *reason); void solidircd_SendBanDel(const char *name, const char *nick); void solidircd_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void solidircd_cmd_svid_umode(const char *nick, time_t ts); -void solidircd_cmd_nc_change(User * u); -void solidircd_cmd_svid_umode2(User * u, const char *ts); -void solidircd_cmd_svid_umode3(User * u, const char *ts); +void solidircd_SendSVID(const char *nick, time_t ts); +void solidircd_SendUnregisteredNick(User * u); +void solidircd_SendSVID2(User * u, const char *ts); +void solidircd_SendSVID3(User * u, const char *ts); void solidircd_cmd_eob(); int solidircd_flood_mode_check(const char *value); void solidircd_cmd_jupe(const char *jserver, const char *who, const char *reason); int solidircd_valid_nick(const char *nick); -void solidircd_cmd_ctcp(const char *source, const char *dest, const char *buf); +void solidircd_SendCTCP(const char *source, const char *dest, const char *buf); class SolidIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/ultimate3.c b/src/protocol/obsolete/ultimate3.c index b35f6e14e..8f39d80d3 100644 --- a/src/protocol/obsolete/ultimate3.c +++ b/src/protocol/obsolete/ultimate3.c @@ -1479,7 +1479,7 @@ void ultimate3_SendSVSHOLDDel(const char *nick) /* SVSMODE +d */ /* sent if svid is something weird */ -void ultimate3_cmd_svid_umode(const char *nick, time_t ts) +void ultimate3_SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, (unsigned long int) ts); @@ -1487,18 +1487,18 @@ void ultimate3_cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void ultimate3_cmd_nc_change(User * u) +void ultimate3_SendUnregisteredNick(User * u) { common_svsmode(u, "+d", "1"); } /* SVSMODE +d */ -void ultimate3_cmd_svid_umode2(User * u, const char *ts) +void ultimate3_SendSVID2(User * u, const char *ts) { /* not used by bahamut ircds */ } -void ultimate3_cmd_svid_umode3(User * u, const char *ts) +void ultimate3_SendSVID3(User * u, const char *ts) { if (u->svid != u->timestamp) { common_svsmode(u, "+rd", ts); @@ -1544,12 +1544,12 @@ int anope_event_sqline(const char *source, int ac, const char **av) return MOD_CONT; } -void ultimate3_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void ultimate3_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { /* Not Supported by this IRCD */ } -void ultimate3_cmd_svspart(const char *source, const char *nick, const char *chan) +void ultimate3_SendSVSPart(const char *source, const char *nick, const char *chan) { /* Not Supported by this IRCD */ } @@ -1682,7 +1682,7 @@ int ultiamte3_valid_chan(const char *chan) } -void ultimate3_cmd_ctcp(const char *source, const char *dest, const char *buf) +void ultimate3_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1761,19 +1761,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(ultimate3_cmd_sgline); pmodule_SendBanDel(ultimate3_cmd_unban); pmodule_SendSVSMode_chan(ultimate3_cmd_svsmode_chan); - pmodule_cmd_svid_umode(ultimate3_cmd_svid_umode); - pmodule_cmd_nc_change(ultimate3_cmd_nc_change); - pmodule_cmd_svid_umode2(ultimate3_cmd_svid_umode2); - pmodule_cmd_svid_umode3(ultimate3_cmd_svid_umode3); - pmodule_cmd_svsjoin(ultimate3_cmd_svsjoin); - pmodule_cmd_svspart(ultimate3_cmd_svspart); + pmodule_SendSVID(ultimate3_cmd_svid_umode); + pmodule_SendUnregisteredNick(ultimate3_cmd_nc_change); + pmodule_SendSVID2(ultimate3_cmd_svid_umode2); + pmodule_SendSVID3(ultimate3_cmd_svid_umode3); + pmodule_SendSVSJoin(ultimate3_cmd_svsjoin); + pmodule_SendSVSPart(ultimate3_cmd_svspart); pmodule_cmd_swhois(ultimate3_cmd_swhois); pmodule_cmd_eob(ultimate3_cmd_eob); pmodule_flood_mode_check(ultiamte3_flood_mode_check); pmodule_cmd_jupe(ultimate3_cmd_jupe); pmodule_valid_nick(ultiamte3_valid_nick); pmodule_valid_chan(ultiamte3_valid_chan); - pmodule_cmd_ctcp(ultimate3_cmd_ctcp); + pmodule_SendCTCP(ultimate3_cmd_ctcp); pmodule_set_umode(ultimate3_set_umode); } diff --git a/src/protocol/obsolete/ultimate3.h b/src/protocol/obsolete/ultimate3.h index a1c0815da..aadb88dfb 100644 --- a/src/protocol/obsolete/ultimate3.h +++ b/src/protocol/obsolete/ultimate3.h @@ -110,15 +110,15 @@ void ultimate3_SendSZLine(const char *mask, const char *reason, const char *whom void ultimate3_SendSGLine(const char *mask, const char *reason); void ultimate3_SendBanDel(const char *name, const char *nick); void ultimate3_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void ultimate3_cmd_svid_umode(const char *nick, time_t ts); -void ultimate3_cmd_nc_change(User * u); -void ultimate3_cmd_svid_umode2(User * u, const char *ts); -void ultimate3_cmd_svid_umode3(User * u, const char *ts); +void ultimate3_SendSVID(const char *nick, time_t ts); +void ultimate3_SendUnregisteredNick(User * u); +void ultimate3_SendSVID2(User * u, const char *ts); +void ultimate3_SendSVID3(User * u, const char *ts); void ultimate3_cmd_eob(); int ultimate3_flood_mode_check(const char *value); void ultimate3_cmd_jupe(const char *jserver, const char *who, const char *reason); int ultimate3_valid_nick(const char *nick); -void ultimate3_cmd_ctcp(const char *source, const char *dest, const char *buf); +void ultimate3_SendCTCP(const char *source, const char *dest, const char *buf); class UltimateIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/obsolete/viagra.c b/src/protocol/obsolete/viagra.c index 5efd81736..0d6bfb179 100644 --- a/src/protocol/obsolete/viagra.c +++ b/src/protocol/obsolete/viagra.c @@ -1446,7 +1446,7 @@ void viagra_SendSVSMode_chan(const char *name, const char *mode, const char *nic /* SVSMODE +d */ /* sent if svid is something weird */ -void viagra_cmd_svid_umode(const char *nick, time_t ts) +void viagra_SendSVID(const char *nick, time_t ts) { send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, (unsigned long int) ts); @@ -1454,18 +1454,18 @@ void viagra_cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void viagra_cmd_nc_change(User * u) +void viagra_SendUnregisteredNick(User * u) { common_svsmode(u, "+d", "1"); } /* SVSMODE +d */ -void viagra_cmd_svid_umode2(User * u, const char *ts) +void viagra_SendSVID2(User * u, const char *ts) { /* not used by bahamut ircds */ } -void viagra_cmd_svid_umode3(User * u, const char *ts) +void viagra_SendSVID3(User * u, const char *ts) { if (u->svid != u->timestamp) { common_svsmode(u, "+rd", ts); @@ -1490,7 +1490,7 @@ void viagra_SendChangeBotNick(const char *oldnick, const char *newnick) * parv[1] = nick to make join * parv[2] = channel(s) to join */ -void viagra_cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void viagra_SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { send_cmd(source, "SVSJOIN %s :%s", nick, chan); } @@ -1501,7 +1501,7 @@ void viagra_cmd_svsjoin(const char *source, const char *nick, const char *chan, * parv[1] = nick to make part * parv[2] = channel(s) to part */ -void viagra_cmd_svspart(const char *source, const char *nick, const char *chan) +void viagra_SendSVSPart(const char *source, const char *nick, const char *chan) { send_cmd(source, "SVSPART %s :%s", nick, chan); } @@ -1581,7 +1581,7 @@ int viagra_valid_chan(const char *chan) } -void viagra_cmd_ctcp(const char *source, const char *dest, const char *buf) +void viagra_SendCTCP(const char *source, const char *dest, const char *buf) { char *s; @@ -1660,19 +1660,19 @@ void moduleAddAnopeCmds() pmodule_SendSGLine(viagra_cmd_sgline); pmodule_SendBanDel(viagra_cmd_unban); pmodule_SendSVSMode_chan(viagra_cmd_svsmode_chan); - pmodule_cmd_svid_umode(viagra_cmd_svid_umode); - pmodule_cmd_nc_change(viagra_cmd_nc_change); - pmodule_cmd_svid_umode2(viagra_cmd_svid_umode2); - pmodule_cmd_svid_umode3(viagra_cmd_svid_umode3); - pmodule_cmd_svsjoin(viagra_cmd_svsjoin); - pmodule_cmd_svspart(viagra_cmd_svspart); + pmodule_SendSVID(viagra_cmd_svid_umode); + pmodule_SendUnregisteredNick(viagra_cmd_nc_change); + pmodule_SendSVID2(viagra_cmd_svid_umode2); + pmodule_SendSVID3(viagra_cmd_svid_umode3); + pmodule_SendSVSJoin(viagra_cmd_svsjoin); + pmodule_SendSVSPart(viagra_cmd_svspart); pmodule_cmd_swhois(viagra_cmd_swhois); pmodule_cmd_eob(viagra_cmd_eob); pmodule_flood_mode_check(viagra_flood_mode_check); pmodule_cmd_jupe(viagra_cmd_jupe); pmodule_valid_nick(viagra_valid_nick); pmodule_valid_chan(viagra_valid_chan); - pmodule_cmd_ctcp(viagra_cmd_ctcp); + pmodule_SendCTCP(viagra_cmd_ctcp); pmodule_set_umode(viagra_set_umode); } diff --git a/src/protocol/obsolete/viagra.h b/src/protocol/obsolete/viagra.h index d91748bb7..1e8bd9111 100644 --- a/src/protocol/obsolete/viagra.h +++ b/src/protocol/obsolete/viagra.h @@ -119,15 +119,15 @@ void viagra_SendSZLine(const char *mask, const char *reason, const char *whom); void viagra_SendSGLine(const char *mask, const char *reason); void viagra_SendBanDel(const char *name, const char *nick); void viagra_SendSVSMode_chan(const char *name, const char *mode, const char *nick); -void viagra_cmd_svid_umode(const char *nick, time_t ts); -void viagra_cmd_nc_change(User * u); -void viagra_cmd_svid_umode2(User * u, const char *ts); -void viagra_cmd_svid_umode3(User * u, const char *ts); +void viagra_SendSVID(const char *nick, time_t ts); +void viagra_SendUnregisteredNick(User * u); +void viagra_SendSVID2(User * u, const char *ts); +void viagra_SendSVID3(User * u, const char *ts); void viagra_cmd_eob(); int viagra_flood_mode_check(const char *value); void viagra_cmd_jupe(const char *jserver, const char *who, const char *reason); int viagra_valid_nick(const char *nick); -void viagra_cmd_ctcp(const char *source, const char *dest, const char *buf); +void viagra_SendCTCP(const char *source, const char *dest, const char *buf); class ViagraIRCdProto : public IRCDProtoNew { public: diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index eb0953b6c..cd08d3377 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1211,7 +1211,7 @@ void UnrealIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const /* SVSMODE +d */ /* sent if svid is something weird */ -void UnrealIRCdProto::cmd_svid_umode(const char *nick, time_t ts) +void UnrealIRCdProto::SendSVID(const char *nick, time_t ts) { if (UseSVS2MODE) send_cmd(ServerName, "%s %s +d 1", send_token("SVS2MODE", "v"), nick); else send_cmd(ServerName, "%s %s +d 1", send_token("SVSMODE", "n"), nick); @@ -1219,13 +1219,13 @@ void UnrealIRCdProto::cmd_svid_umode(const char *nick, time_t ts) /* SVSMODE +d */ /* nc_change was = 1, and there is no na->status */ -void UnrealIRCdProto::cmd_nc_change(User *u) +void UnrealIRCdProto::SendUnregisteredNick(User *u) { common_svsmode(u, "-r+d", "1"); } /* SVSMODE +r */ -void UnrealIRCdProto::cmd_svid_umode2(User *u, const char *ts) +void UnrealIRCdProto::SendSVID2(User *u, const char *ts) { if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts); else common_svsmode(u, "+r", NULL); @@ -1263,7 +1263,7 @@ int anope_event_smo(const char *source, int ac, const char **av) /* In older Unreal SVSJOIN and SVSNLINE tokens were mixed so SVSJOIN and SVSNLINE are broken when coming from a none TOKEN'd server */ -void UnrealIRCdProto::cmd_svsjoin(const char *source, const char *nick, const char *chan, const char *param) +void UnrealIRCdProto::SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) { if (param) send_cmd(source, "%s %s %s :%s", send_token("SVSJOIN", "BX"), nick, chan, param); else send_cmd(source, "%s %s :%s", send_token("SVSJOIN", "BX"), nick, chan); @@ -1274,7 +1274,7 @@ void UnrealIRCdProto::cmd_svsjoin(const char *source, const char *nick, const ch parv[1] - nick to make part parv[2] - channel(s) to part */ -void UnrealIRCdProto::cmd_svspart(const char *source, const char *nick, const char *chan) +void UnrealIRCdProto::SendSVSPart(const char *source, const char *nick, const char *chan) { send_cmd(source, "%s %s :%s", send_token("SVSPART", "BT"), nick, chan); } diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 1b3016848..fc03a8da7 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -110,11 +110,11 @@ class UnrealIRCdProto : public IRCDProto { void SendSGLine(const char *, const char *); void SendBanDel(const char *, const char *); void SendSVSMode_chan(const char *, const char *, const char *); - void cmd_svid_umode(const char *, time_t); - void cmd_nc_change(User *); - void cmd_svid_umode2(User *, const char *); - void cmd_svsjoin(const char *, const char *, const char *, const char *); - void cmd_svspart(const char *, const char *, const char *); + void SendSVID(const char *, time_t); + void SendUnregisteredNick(User *); + void SendSVID2(User *, const char *); + void SendSVSJoin(const char *, const char *, const char *, const char *); + void SendSVSPart(const char *, const char *, const char *); void cmd_swhois(const char *, const char *, const char *); void cmd_eob(); void cmd_server(const char *, int, const char *); diff --git a/src/users.c b/src/users.c index 97af11136..2341149e4 100644 --- a/src/users.c +++ b/src/users.c @@ -662,7 +662,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const /* Resets the svid because it doesn't match */ user->svid = 1; - anope_cmd_svid_umode(user->nick, user->timestamp); + anope_SendSVID(user->nick, user->timestamp); } else { user->svid = 1; @@ -727,7 +727,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const if (!nc_changed && (user->na)) user->na->status |= status; else { - anope_cmd_nc_change(user); + anope_SendUnregisteredNick(user); } } @@ -763,7 +763,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const snprintf(tsbuf, sizeof(tsbuf), "%lu", (unsigned long int) user->timestamp); - anope_cmd_svid_umode2(user, tsbuf); + anope_SendSVID2(user, tsbuf); alog("%s: %s!%s@%s automatically identified for nick %s", s_NickServ, user->nick, user->username, @@ -777,7 +777,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const char tsbuf[16]; snprintf(tsbuf, sizeof(tsbuf), "%lu", (unsigned long int) user->timestamp); - anope_cmd_svid_umode3(user, tsbuf); + anope_SendSVID3(user, tsbuf); } } |