diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ircd.c | 8 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 5 | ||||
-rw-r--r-- | src/protocol/bahamut.h | 2 | ||||
-rw-r--r-- | src/protocol/charybdis.c | 10 | ||||
-rw-r--r-- | src/protocol/charybdis.h | 2 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 7 | ||||
-rwxr-xr-x | src/protocol/inspircd11.h | 1 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 10 | ||||
-rw-r--r-- | src/protocol/ratbox.h | 2 | ||||
-rw-r--r-- | src/protocol/unreal32.c | 8 | ||||
-rw-r--r-- | src/protocol/unreal32.h | 2 |
11 files changed, 16 insertions, 41 deletions
diff --git a/src/ircd.c b/src/ircd.c index 2bd2e69e0..e7cefcc4f 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -63,7 +63,6 @@ void initIrcdProto() ircdproto.ircd_cmd_242 = NULL; ircdproto.ircd_cmd_243 = NULL; ircdproto.ircd_cmd_211 = NULL; - ircdproto.ircd_cmd_sgline = NULL; ircdproto.ircd_cmd_unban = NULL; ircdproto.ircd_cmd_svsmode_chan = NULL; ircdproto.ircd_cmd_svid_umode = NULL; @@ -517,7 +516,7 @@ void anope_cmd_szline(const char *mask, const char *reason, const char *whom) void anope_cmd_sgline(const char *mask, const char *reason) { - ircdproto.ircd_cmd_sgline(mask, reason); + ircdprotonew->cmd_sgline(mask, reason); } void anope_cmd_unban(const char *name, const char *nick) @@ -700,11 +699,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void pmodule_cmd_sgline(void (*func) (const char *mask, const char *reason)) -{ - ircdproto.ircd_cmd_sgline = func; -} - void pmodule_cmd_unban(void (*func) (const char *name, const char *nick)) { ircdproto.ircd_cmd_unban = func; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index dd3aea8a2..8b1a31698 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -728,9 +728,9 @@ void bahamut_cmd_svsadmin(const char *server, int set) } /* SGLINE */ -void bahamut_cmd_sgline(const char *mask, const char *reason) +void BahamutIRCdProto::cmd_sgline(const char *mask, const char *reason) { - send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason); + send_cmd(NULL, "SGLINE %d :%s:%s", static_cast<int>(strlen(mask)), mask, reason); } /* RAKILL */ @@ -1395,7 +1395,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(bahamut_cmd_242); pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); - pmodule_cmd_sgline(bahamut_cmd_sgline); pmodule_cmd_unban(bahamut_cmd_unban); pmodule_cmd_svsmode_chan(bahamut_cmd_svsmode_chan); pmodule_cmd_svid_umode(bahamut_cmd_svid_umode); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 5c213511b..b35c7bb81 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who); void bahamut_cmd_242(const char *buf); void bahamut_cmd_243(const char *buf); void bahamut_cmd_211(const char *buf); -void bahamut_cmd_sgline(const char *mask, const char *reason); void bahamut_cmd_unban(const char *name, const char *nick); void bahamut_cmd_svsmode_chan(const char *name, const char *mode, const char *nick); void bahamut_cmd_svid_umode(const char *nick, time_t ts); @@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew { void cmd_unsgline(const char *); void cmd_unszline(const char *); void cmd_szline(const char *, const char *, const char *); + void cmd_sgline(const char *, const char *); } ircd_proto; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 58c8bd536..42b0c995e 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -762,13 +762,10 @@ void charybdis_cmd_svsadmin(const char *server, int set) { } -void charybdis_cmd_sgline(const char *mask, const char *reason) +void CharybdisProto::cmd_sgline(const char *mask, const char *reason) { - Uid *ud; - - ud = find_uid(s_OperServ); - send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ), - "XLINE * %s 0 :%s", mask, reason); + Uid *ud = find_uid(s_OperServ); + send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "XLINE * %s 0 :%s", mask, reason); } void CharybdisProto::cmd_remove_akill(const char *user, const char *host) @@ -1657,7 +1654,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(charybdis_cmd_242); pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); - pmodule_cmd_sgline(charybdis_cmd_sgline); pmodule_cmd_unban(charybdis_cmd_unban); pmodule_cmd_svsmode_chan(charybdis_cmd_svsmode_chan); pmodule_cmd_svid_umode(charybdis_cmd_svid_umode); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index bd99f1b33..c990cfa62 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who); void charybdis_cmd_242(const char *buf); void charybdis_cmd_243(const char *buf); void charybdis_cmd_211(const char *buf); -void charybdis_cmd_sgline(const char *mask, const char *reason); void charybdis_cmd_unban(const char *name, const char *nick); void charybdis_cmd_svsmode_chan(const char *name, const char *mode, const char *nick); void charybdis_cmd_svid_umode(const char *nick, time_t ts); @@ -108,4 +107,5 @@ class CharybdisProto : public IRCDProtoNew { void cmd_svshold(const char *); void cmd_release_svshold(const char *); void cmd_unsgline(const char *); + void cmd_sgline(const char *, const char *); } ircd_proto; diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 6f49b4788..a9b2d4820 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1479,12 +1479,6 @@ void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom) send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); } -/* SGLINE */ -void inspircd_cmd_sgline(const char *mask, const char *reason) -{ - /* Not Supported by this IRCD */ -} - void inspircd_cmd_unban(const char *name, const char *nick) { /* Not Supported by this IRCD */ @@ -1640,7 +1634,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(inspircd_cmd_242); pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); - pmodule_cmd_sgline(inspircd_cmd_sgline); pmodule_cmd_unban(inspircd_cmd_unban); pmodule_cmd_svsmode_chan(inspircd_cmd_svsmode_chan); pmodule_cmd_svid_umode(inspircd_cmd_svid_umode); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index 54f6a47ca..424f816a3 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who); void inspircd_cmd_242(const char *buf); void inspircd_cmd_243(const char *buf); void inspircd_cmd_211(const char *buf); -void inspircd_cmd_sgline(const char *mask, const char *reason); void inspircd_cmd_unban(const char *name, const char *nick); void inspircd_cmd_svsmode_chan(const char *name, const char *mode, const char *nick); void inspircd_cmd_svid_umode(const char *nick, time_t ts); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 406d25d0b..ea51a22df 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -709,13 +709,10 @@ void ratbox_cmd_svsadmin(const char *server, int set) { } -void ratbox_cmd_sgline(const char *mask, const char *reason) +void RatboxProto::cmd_sgline(const char *mask, const char *reason) { - Uid *ud; - - ud = find_uid(s_OperServ); - send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ), - "XLINE * %s 0 :%s", mask, reason); + Uid *ud = find_uid(s_OperServ); + send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "XLINE * %s 0 :%s", mask, reason); } void RatboxProto::cmd_remove_akill(const char *user, const char *host) @@ -1535,7 +1532,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(ratbox_cmd_242); pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); - pmodule_cmd_sgline(ratbox_cmd_sgline); pmodule_cmd_unban(ratbox_cmd_unban); pmodule_cmd_svsmode_chan(ratbox_cmd_svsmode_chan); pmodule_cmd_svid_umode(ratbox_cmd_svid_umode); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 304812fac..a53dc817d 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who); void ratbox_cmd_242(const char *buf); void ratbox_cmd_243(const char *buf); void ratbox_cmd_211(const char *buf); -void ratbox_cmd_sgline(const char *mask, const char *reason); void ratbox_cmd_unban(const char *name, const char *nick); void ratbox_cmd_svsmode_chan(const char *name, const char *mode, const char *nick); void ratbox_cmd_svid_umode(const char *nick, time_t ts); @@ -103,4 +102,5 @@ class RatboxProto : public IRCDProtoNew { void cmd_svsnick(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 *); } ircd_proto; diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index c5e85f180..9625b542e 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1375,13 +1375,12 @@ void UnrealIRCdProto::cmd_szline(const char *mask, const char *reason, const cha /* * SVSNLINE + reason_where_is_space :realname mask with spaces */ -void unreal_cmd_sgline(const char *mask, const char *reason) +void UnrealIRCdProto::cmd_sgline(const char *mask, const char *reason) { char edited_reason[BUFSIZE]; strlcpy(edited_reason, reason, BUFSIZE); - strnrepl(edited_reason, BUFSIZE, " ", "_"); - send_cmd(NULL, "%s + %s :%s", send_token("SVSNLINE", "BR"), edited_reason, - mask); + strnrepl(edited_reason, BUFSIZE, " ", "_"); + send_cmd(NULL, "%s + %s :%s", send_token("SVSNLINE", "BR"), edited_reason, mask); } /* SVSMODE -b */ @@ -1935,7 +1934,6 @@ void moduleAddAnopeCmds() pmodule_cmd_242(unreal_cmd_242); pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); - pmodule_cmd_sgline(unreal_cmd_sgline); pmodule_cmd_unban(unreal_cmd_unban); pmodule_cmd_svsmode_chan(unreal_cmd_svsmode_chan); pmodule_cmd_svid_umode(unreal_cmd_svid_umode); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index f1352278d..c6a0d87a4 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who); void unreal_cmd_242(const char *buf); void unreal_cmd_243(const char *buf); void unreal_cmd_211(const char *buf); -void unreal_cmd_sgline(const char *mask, const char *reason); void unreal_cmd_unban(const char *name, const char *nick); void unreal_cmd_svsmode_chan(const char *name, const char *mode, const char *nick); void unreal_cmd_svid_umode(const char *nick, time_t ts); @@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew { void cmd_unsgline(const char *); void cmd_unszline(const char *); void cmd_szline(const char *, const char *, const char *); + void cmd_sgline(const char *, const char *); } ircd_proto; |