diff options
Diffstat (limited to 'src')
37 files changed, 60 insertions, 113 deletions
diff --git a/src/ircd.c b/src/ircd.c index 450767e67..80c72cf65 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -46,7 +46,6 @@ void initIrcdProto() { ircdproto.ircd_set_mod_current_buffer = NULL; ircdproto.ircd_set_umode = NULL; - ircdproto.ircd_cmd_remove_akill = NULL; ircdproto.ircd_cmd_topic = NULL; ircdproto.ircd_cmd_vhost_off = NULL; ircdproto.ircd_cmd_akill = NULL; @@ -138,12 +137,12 @@ void anope_set_umode(User * user, int ac, const char **av) void anope_cmd_svsnoop(const char *server, int set) { - ircdprotonew->cmd_svsnoop(server, set); + ircdprotonew->cmd_svsnoop(server, set); } void anope_cmd_remove_akill(const char *user, const char *host) { - ircdproto.ircd_cmd_remove_akill(user, host); + ircdprotonew->cmd_remove_akill(user, host); } void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, @@ -703,11 +702,6 @@ void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av)) ircdproto.ircd_set_mod_current_buffer = func; } -void pmodule_cmd_remove_akill(void (*func) (const char *user, const char *host)) -{ - ircdproto.ircd_cmd_remove_akill = func; -} - void pmodule_cmd_topic(void (*func) (const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)) diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index bae334257..7c5a33d3a 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -748,9 +748,9 @@ void bahamut_cmd_sgline(char *mask, char *reason) } /* RAKILL */ -void bahamut_cmd_remove_akill(char *user, char *host) +void BahamutIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } /* PART */ @@ -1565,7 +1565,6 @@ void bahamut_cmd_chghost(char *nick, char *vhost) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(bahamut_cmd_remove_akill); pmodule_cmd_topic(bahamut_cmd_topic); pmodule_cmd_vhost_off(bahamut_cmd_vhost_off); pmodule_cmd_akill(bahamut_cmd_akill); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 1a6270c4d..8fc605b32 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -59,8 +59,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void bahamut_set_umode(User * user, int ac, char **av); -void bahamut_cmd_svsnoop(char *server, int set); -void bahamut_cmd_remove_akill(char *user, char *host); void bahamut_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void bahamut_cmd_vhost_off(User * u); void bahamut_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -132,4 +130,5 @@ void bahamut_cmd_ctcp(char *source, char *dest, char *buf); class BahamutIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index c3f194fbf..1a3c72a89 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -859,13 +859,10 @@ void charybdis_cmd_sgline(char *mask, char *reason) "XLINE * %s 0 :%s", mask, reason); } -void charybdis_cmd_remove_akill(char *user, char *host) +void Charybdis::cmd_remove_akill(const char *user, const char *host) { - Uid *ud; - - ud = find_uid(s_OperServ); - send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ), - "UNKLINE * %s %s", user, host); + Uid *ud = find_uid(s_OperServ); + send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host); } void charybdis_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1867,7 +1864,6 @@ int charybdis_send_deaccount(int argc, char **argv) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(charybdis_cmd_remove_akill); pmodule_cmd_topic(charybdis_cmd_topic); pmodule_cmd_vhost_off(charybdis_cmd_vhost_off); pmodule_cmd_akill(charybdis_cmd_akill); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index 5eae1e275..46dbbdf06 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -47,8 +47,6 @@ void charybdis_set_umode(User * user, int ac, char **av); -void charybdis_cmd_svsnoop(char *server, int set); -void charybdis_cmd_remove_akill(char *user, char *host); void charybdis_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void charybdis_cmd_vhost_off(User * u); void charybdis_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -119,4 +117,5 @@ void charybdis_cmd_ctcp(char *source, char *dest, char *buf); class CharybdisProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c index a73573662..5af98dcdb 100644 --- a/src/protocol/dreamforge.c +++ b/src/protocol/dreamforge.c @@ -531,9 +531,9 @@ void dreamforge_cmd_svsadmin(char *server, int set) ircd_proto.cmd_svsnoop(server, set); } -void dreamforge_cmd_remove_akill(char *user, char *host) +void DreamForgeProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } void dreamforge_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1270,7 +1270,6 @@ void dreamforge_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(dreamforge_cmd_remove_akill); pmodule_cmd_topic(dreamforge_cmd_topic); pmodule_cmd_vhost_off(dreamforge_cmd_vhost_off); pmodule_cmd_akill(dreamforge_cmd_akill); diff --git a/src/protocol/dreamforge.h b/src/protocol/dreamforge.h index d0baf22d1..e11e9f0f2 100644 --- a/src/protocol/dreamforge.h +++ b/src/protocol/dreamforge.h @@ -39,8 +39,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void dreamforge_set_umode(User * user, int ac, char **av); -void dreamforge_cmd_svsnoop(char *server, int set); -void dreamforge_cmd_remove_akill(char *user, char *host); void dreamforge_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void dreamforge_cmd_vhost_off(User * u); void dreamforge_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -112,4 +110,5 @@ void dreamforge_cmd_ctcp(char *source, char *dest, char *buf); class DreamForgeProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c index c624e7d19..51566df95 100644 --- a/src/protocol/hybrid.c +++ b/src/protocol/hybrid.c @@ -692,10 +692,10 @@ void hybrid_cmd_sgline(char *mask, char *reason) send_cmd(ServerName, "XLINE * %s 0 :%s", mask, reason); } -void hybrid_cmd_remove_akill(char *user, char *host) +void HybridIRCdProto::cmd_remove_akill(const char *user, const char *host) { - /* hybrid seems to support UNKLINE -Certus */ - send_cmd(s_OperServ, "UNKLINE * %s %s", user, host); + /* hybrid seems to support UNKLINE -Certus */ + send_cmd(s_OperServ, "UNKLINE * %s %s", user, host); } void hybrid_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1453,7 +1453,6 @@ void hybrid_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(hybrid_cmd_remove_akill); pmodule_cmd_topic(hybrid_cmd_topic); pmodule_cmd_vhost_off(hybrid_cmd_vhost_off); pmodule_cmd_akill(hybrid_cmd_akill); diff --git a/src/protocol/hybrid.h b/src/protocol/hybrid.h index 7e116ed3d..3d52b6e83 100644 --- a/src/protocol/hybrid.h +++ b/src/protocol/hybrid.h @@ -44,8 +44,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t void hybrid_set_umode(User * user, int ac, char **av); -void hybrid_cmd_svsnoop(char *server, int set); -void hybrid_cmd_remove_akill(char *user, char *host); void hybrid_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void hybrid_cmd_vhost_off(User * u); void hybrid_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -116,4 +114,5 @@ void hybrid_cmd_ctcp(char *source, char *dest, char *buf); class HybridIRCdProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/inspircd10.c b/src/protocol/inspircd10.c index 051f8fbe4..ba5881d09 100644 --- a/src/protocol/inspircd10.c +++ b/src/protocol/inspircd10.c @@ -508,9 +508,9 @@ void inspircd_cmd_svsadmin(char *server, int set) /* Not Supported by this IRCD */ } -void inspircd_cmd_remove_akill(char *user, char *host) +void InspIRCd::cmd_remove_akill(const char *user, const char *host) { - send_cmd(s_OperServ, "GLINE %s@%s", user, host); + send_cmd(s_OperServ, "GLINE %s@%s", user, host); } void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1594,7 +1594,6 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(inspircd_cmd_remove_akill); pmodule_cmd_topic(inspircd_cmd_topic); pmodule_cmd_vhost_off(inspircd_cmd_vhost_off); pmodule_cmd_akill(inspircd_cmd_akill); diff --git a/src/protocol/inspircd10.h b/src/protocol/inspircd10.h index 6a992efaf..35c69e040 100644 --- a/src/protocol/inspircd10.h +++ b/src/protocol/inspircd10.h @@ -52,8 +52,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void inspircd_set_umode(User * user, int ac, char **av); -void inspircd_cmd_svsnoop(char *server, int set); -void inspircd_cmd_remove_akill(char *user, char *host); void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void inspircd_cmd_vhost_off(User * u); void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -134,4 +132,5 @@ int anope_event_idle(char* source, int ac, char **av); class InspIRCdProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 25cdf8d38..ea272697c 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -528,9 +528,9 @@ void inspircd_cmd_svsadmin(char *server, int set) /* Not Supported by this IRCD */ } -void inspircd_cmd_remove_akill(char *user, char *host) +void InspIRCd::cmd_remove_akill(const char *user, const char *host) { - send_cmd(s_OperServ, "GLINE %s@%s", user, host); + send_cmd(s_OperServ, "GLINE %s@%s", user, host); } void @@ -1807,7 +1807,6 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(inspircd_cmd_remove_akill); pmodule_cmd_topic(inspircd_cmd_topic); pmodule_cmd_vhost_off(inspircd_cmd_vhost_off); pmodule_cmd_akill(inspircd_cmd_akill); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index e12b3f9f5..4e9a8e85b 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -52,8 +52,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void inspircd_set_umode(User * user, int ac, char **av); -void inspircd_cmd_svsnoop(char *server, int set); -void inspircd_cmd_remove_akill(char *user, char *host); void inspircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void inspircd_cmd_vhost_off(User * u); void inspircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -135,4 +133,5 @@ int anope_event_rsquit(char *source, int ac, char **av); class InspIRCdProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c index 7558597ab..8ba499410 100644 --- a/src/protocol/plexus2.c +++ b/src/protocol/plexus2.c @@ -812,10 +812,9 @@ plexus_cmd_sgline (char *mask, char *reason) send_cmd (s_OperServ, "XLINE * %s :%s", mask, reason); } -void -plexus_cmd_remove_akill (char *user, char *host) +void PleXusIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd (s_OperServ, "UNKLINE * %s %s", user, host); + send_cmd(s_OperServ, "UNKLINE * %s %s", user, host); } void @@ -1756,7 +1755,6 @@ plexus_cmd_ctcp (char *source, char *dest, char *buf) void moduleAddAnopeCmds () { - pmodule_cmd_remove_akill (plexus_cmd_remove_akill); pmodule_cmd_topic (plexus_cmd_topic); pmodule_cmd_vhost_off (plexus_cmd_vhost_off); pmodule_cmd_akill (plexus_cmd_akill); diff --git a/src/protocol/plexus2.h b/src/protocol/plexus2.h index 20f74770b..e7d2097a4 100644 --- a/src/protocol/plexus2.h +++ b/src/protocol/plexus2.h @@ -53,8 +53,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t void plexus_set_umode(User * user, int ac, char **av); -void plexus_cmd_svsnoop(char *server, int set); -void plexus_cmd_remove_akill(char *user, char *host); void plexus_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void plexus_cmd_vhost_off(User * u); void plexus_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -125,4 +123,5 @@ void plexus_cmd_ctcp(char *source, char *dest, char *buf); class PleXusIRCdProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c index 17b61fc21..242f8e5ed 100644 --- a/src/protocol/plexus3.c +++ b/src/protocol/plexus3.c @@ -793,10 +793,9 @@ plexus_cmd_sgline (char *mask, char *reason) send_cmd (s_OperServ, "XLINE * %s 0 :%s", mask, reason); } -void -plexus_cmd_remove_akill (char *user, char *host) +void PleXusIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd (s_OperServ, "UNKLINE * %s %s", user, host); + send_cmd(s_OperServ, "UNKLINE * %s %s", user, host); } void @@ -1738,7 +1737,6 @@ plexus_cmd_ctcp (char *source, char *dest, char *buf) void moduleAddAnopeCmds () { - pmodule_cmd_remove_akill (plexus_cmd_remove_akill); pmodule_cmd_topic (plexus_cmd_topic); pmodule_cmd_vhost_off (plexus_cmd_vhost_off); pmodule_cmd_akill (plexus_cmd_akill); diff --git a/src/protocol/plexus3.h b/src/protocol/plexus3.h index e90ee525b..b3990f075 100644 --- a/src/protocol/plexus3.h +++ b/src/protocol/plexus3.h @@ -40,8 +40,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t void plexus_set_umode(User * user, int ac, char **av); -void plexus_cmd_svsnoop(char *server, int set); -void plexus_cmd_remove_akill(char *user, char *host); void plexus_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void plexus_cmd_vhost_off(User * u); void plexus_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -113,4 +111,5 @@ void plexus_cmd_ctcp(char *source, char *dest, char *buf); class PleXusIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c index 2b37f56f9..be1c3e3b1 100644 --- a/src/protocol/ptlink.c +++ b/src/protocol/ptlink.c @@ -695,9 +695,9 @@ void ptlink_cmd_svsadmin(char *server, int set) parv[0] = sender (server if on network synchronization) parv[1] = glined usert@host mask or ALL to remove all glines */ -void ptlink_cmd_remove_akill(char *user, char *host) +void PTlinkProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "UNGLINE %s@%s", user, host); + send_cmd(NULL, "UNGLINE %s@%s", user, host); } @@ -1682,7 +1682,6 @@ void ptlink_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(ptlink_cmd_remove_akill); pmodule_cmd_topic(ptlink_cmd_topic); pmodule_cmd_vhost_off(ptlink_cmd_vhost_off); pmodule_cmd_akill(ptlink_cmd_akill); diff --git a/src/protocol/ptlink.h b/src/protocol/ptlink.h index e9e8a1751..5c949670c 100644 --- a/src/protocol/ptlink.h +++ b/src/protocol/ptlink.h @@ -79,8 +79,6 @@ #define PTLINK_TS_MIN 3 void ptlink_set_umode(User * user, int ac, char **av); -void ptlink_cmd_svsnoop(char *server, int set); -void ptlink_cmd_remove_akill(char *user, char *host); void ptlink_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void ptlink_cmd_vhost_off(User * u); void ptlink_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -152,4 +150,5 @@ void ptlink_cmd_ctcp(char *source, char *dest, char *buf); class PTlinkProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c index 58e37f3e7..bbc3541a1 100644 --- a/src/protocol/rageircd.c +++ b/src/protocol/rageircd.c @@ -636,9 +636,9 @@ void rageircd_cmd_sgline(char *mask, char *reason) } -void rageircd_cmd_remove_akill(char *user, char *host) +void RageIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } @@ -1562,7 +1562,6 @@ void rageircd_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(rageircd_cmd_remove_akill); pmodule_cmd_topic(rageircd_cmd_topic); pmodule_cmd_vhost_off(rageircd_cmd_vhost_off); pmodule_cmd_akill(rageircd_cmd_akill); diff --git a/src/protocol/rageircd.h b/src/protocol/rageircd.h index 4dbd2e1c9..3db80a60e 100644 --- a/src/protocol/rageircd.h +++ b/src/protocol/rageircd.h @@ -42,8 +42,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void rageircd_set_umode(User * user, int ac, char **av); -void rageircd_cmd_svsnoop(char *server, int set); -void rageircd_cmd_remove_akill(char *user, char *host); void rageircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void rageircd_cmd_vhost_off(User * u); void rageircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -115,4 +113,5 @@ void rageircd_cmd_ctcp(char *source, char *dest, char *buf); class RageIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index ec1ed357a..edeebd12f 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -806,13 +806,10 @@ void ratbox_cmd_sgline(char *mask, char *reason) "XLINE * %s 0 :%s", mask, reason); } -void ratbox_cmd_remove_akill(char *user, char *host) +void RatboxProto::cmd_remove_akill(const char *user, const char *host) { - Uid *ud; - - ud = find_uid(s_OperServ); - send_cmd((UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ), - "UNKLINE * %s %s", user, host); + Uid *ud = find_uid(s_OperServ); + send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host); } void ratbox_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1762,7 +1759,6 @@ void ratbox_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(ratbox_cmd_remove_akill); pmodule_cmd_topic(ratbox_cmd_topic); pmodule_cmd_vhost_off(ratbox_cmd_vhost_off); pmodule_cmd_akill(ratbox_cmd_akill); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 1605a63c6..81af922bc 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -46,8 +46,6 @@ void ratbox_set_umode(User * user, int ac, char **av); -void ratbox_cmd_svsnoop(char *server, int set); -void ratbox_cmd_remove_akill(char *user, char *host); void ratbox_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void ratbox_cmd_vhost_off(User * u); void ratbox_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -118,4 +116,5 @@ void ratbox_cmd_ctcp(char *source, char *dest, char *buf); class RatboxProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c index 350a9e690..b8325c976 100644 --- a/src/protocol/shadowircd.c +++ b/src/protocol/shadowircd.c @@ -842,12 +842,10 @@ void shadowircd_cmd_sgline(char *mask, char *reason) /* does not support */ } -void shadowircd_cmd_remove_akill(char *user, char *host) +void ShadowIRCdProto::cmd_remove_akill(const char *user, const char *host) { - Uid *ud; - - ud = find_uid(s_OperServ); - send_cmd((ud ? ud->uid : s_OperServ), "UNKLINE * %s %s", user, host); + Uid *ud = find_uid(s_OperServ); + send_cmd(ud ? ud->uid : s_OperServ, "UNKLINE * %s %s", user, host); } void shadowircd_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1713,7 +1711,6 @@ void shadowircd_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(shadowircd_cmd_remove_akill); pmodule_cmd_topic(shadowircd_cmd_topic); pmodule_cmd_vhost_off(shadowircd_cmd_vhost_off); pmodule_cmd_akill(shadowircd_cmd_akill); diff --git a/src/protocol/shadowircd.h b/src/protocol/shadowircd.h index 7d63e8dcb..ab76b72f9 100644 --- a/src/protocol/shadowircd.h +++ b/src/protocol/shadowircd.h @@ -71,8 +71,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void shadowircd_set_umode(User * user, int ac, char **av); -void shadowircd_cmd_svsnoop(char *server, int set); -void shadowircd_cmd_remove_akill(char *user, char *host); void shadowircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void shadowircd_cmd_vhost_off(User * u); void shadowircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -143,4 +141,5 @@ void shadowircd_cmd_ctcp(char *source, char *dest, char *buf); class ShadowIRCdProto : public IRCDProtoNew { public: + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c index a82ec44f2..8e7df31b9 100644 --- a/src/protocol/solidircd.c +++ b/src/protocol/solidircd.c @@ -772,9 +772,9 @@ void solidircd_cmd_sgline(char *mask, char *reason) } /* RAKILL */ -void solidircd_cmd_remove_akill(char *user, char *host) +void SolidIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } /* PART */ @@ -1595,7 +1595,6 @@ void solidircd_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(solidircd_cmd_remove_akill); pmodule_cmd_topic(solidircd_cmd_topic); pmodule_cmd_vhost_off(solidircd_cmd_vhost_off); pmodule_cmd_akill(solidircd_cmd_akill); diff --git a/src/protocol/solidircd.h b/src/protocol/solidircd.h index b6930ba28..5ed772ff0 100644 --- a/src/protocol/solidircd.h +++ b/src/protocol/solidircd.h @@ -66,8 +66,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void solidircd_set_umode(User * user, int ac, char **av); -void solidircd_cmd_svsnoop(char *server, int set); -void solidircd_cmd_remove_akill(char *user, char *host); void solidircd_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void solidircd_cmd_vhost_off(User * u); void solidircd_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -139,4 +137,5 @@ void solidircd_cmd_ctcp(char *source, char *dest, char *buf); class SolidIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c index e9593addd..9c5ce5ca9 100644 --- a/src/protocol/ultimate2.c +++ b/src/protocol/ultimate2.c @@ -792,9 +792,9 @@ void ultimate2_cmd_svsadmin(char *server, int set) ircd_proto.cmd_svsnoop(server, set); } -void ultimate2_cmd_remove_akill(char *user, char *host) +void UltimateIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } @@ -1620,7 +1620,6 @@ void ultimate2_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(ultimate2_cmd_remove_akill); pmodule_cmd_topic(ultimate2_cmd_topic); pmodule_cmd_vhost_off(ultimate2_cmd_vhost_off); pmodule_cmd_akill(ultimate2_cmd_akill); diff --git a/src/protocol/ultimate2.h b/src/protocol/ultimate2.h index a80e699e7..a3e847653 100644 --- a/src/protocol/ultimate2.h +++ b/src/protocol/ultimate2.h @@ -47,8 +47,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void ultimate2_set_umode(User * user, int ac, char **av); -void ultimate2_cmd_svsnoop(char *server, int set); -void ultimate2_cmd_remove_akill(char *user, char *host); void ultimate2_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void ultimate2_cmd_vhost_off(User * u); void ultimate2_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -120,4 +118,5 @@ void ultimate2_cmd_ctcp(char *source, char *dest, char *buf); class UltimateIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c index 41e4e3a07..21b9f82d4 100644 --- a/src/protocol/ultimate3.c +++ b/src/protocol/ultimate3.c @@ -710,9 +710,9 @@ void ultimate3_cmd_sgline(char *mask, char *reason) send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason); } -void ultimate3_cmd_remove_akill(char *user, char *host) +void UltimateIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } void ultimate3_cmd_vhost_off(User * u) @@ -1703,7 +1703,6 @@ void ultimate3_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(ultimate3_cmd_remove_akill); pmodule_cmd_topic(ultimate3_cmd_topic); pmodule_cmd_vhost_off(ultimate3_cmd_vhost_off); pmodule_cmd_akill(ultimate3_cmd_akill); diff --git a/src/protocol/ultimate3.h b/src/protocol/ultimate3.h index 638598094..deb31d496 100644 --- a/src/protocol/ultimate3.h +++ b/src/protocol/ultimate3.h @@ -52,8 +52,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void ultimate3_set_umode(User * user, int ac, char **av); -void ultimate3_cmd_svsnoop(char *server, int set); -void ultimate3_cmd_remove_akill(char *user, char *host); void ultimate3_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void ultimate3_cmd_vhost_off(User * u); void ultimate3_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -125,4 +123,5 @@ void ultimate3_cmd_ctcp(char *source, char *dest, char *buf); class UltimateIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c index 0c44a3e8b..4978017f1 100644 --- a/src/protocol/unreal31.c +++ b/src/protocol/unreal31.c @@ -501,9 +501,9 @@ void unreal_cmd_svsadmin(char *server, int set) ircd_proto.cmd_svsnoop(server, set); } -void unreal_cmd_remove_akill(char *user, char *host) +void UnrealIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "TKL - G %s %s %s", user, host, s_OperServ); + send_cmd(NULL, "TKL - G %s %s %s", user, host, s_OperServ); } void unreal_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -1478,7 +1478,6 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(unreal_cmd_remove_akill); pmodule_cmd_topic(unreal_cmd_topic); pmodule_cmd_vhost_off(unreal_cmd_vhost_off); pmodule_cmd_akill(unreal_cmd_akill); diff --git a/src/protocol/unreal31.h b/src/protocol/unreal31.h index a335bdf74..e35d3376b 100644 --- a/src/protocol/unreal31.h +++ b/src/protocol/unreal31.h @@ -52,8 +52,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void unreal_set_umode(User * user, int ac, char **av); -void unreal_cmd_svsnoop(char *server, int set); -void unreal_cmd_remove_akill(char *user, char *host); void unreal_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void unreal_cmd_vhost_off(User * u); void unreal_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -125,4 +123,5 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf); class UnrealIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index b075306a4..8411cd2c2 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -512,10 +512,9 @@ void unreal_cmd_svsadmin(char *server, int set) ircd_proto.cmd_svsnoop(server, set); } -void unreal_cmd_remove_akill(char *user, char *host) +void UnrealIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "%s - G %s %s %s", send_token("TKL", "BD"), user, host, - s_OperServ); + send_cmd(NULL, "%s - G %s %s %s", send_token("TKL", "BD"), user, host, s_OperServ); } void unreal_cmd_topic(char *whosets, char *chan, char *whosetit, @@ -2117,7 +2116,6 @@ void moduleAddIRCDMsgs(void) { **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(unreal_cmd_remove_akill); pmodule_cmd_topic(unreal_cmd_topic); pmodule_cmd_vhost_off(unreal_cmd_vhost_off); pmodule_cmd_akill(unreal_cmd_akill); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 6e1e9c6a8..070d62503 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -81,8 +81,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void unreal_set_umode(User * user, int ac, char **av); -void unreal_cmd_svsnoop(char *server, int set); -void unreal_cmd_remove_akill(char *user, char *host); void unreal_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void unreal_cmd_vhost_off(User * u); void unreal_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -154,4 +152,5 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf); class UnrealIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c index d2889510e..5c54b2955 100644 --- a/src/protocol/viagra.c +++ b/src/protocol/viagra.c @@ -781,9 +781,9 @@ void viagra_cmd_sgline(char *mask, char *reason) send_cmd(NULL, "SGLINE %d :%s:%s", (int)strlen(mask), mask, reason); } -void viagra_cmd_remove_akill(char *user, char *host) +void ViagraIRCdProto::cmd_remove_akill(const char *user, const char *host) { - send_cmd(NULL, "RAKILL %s %s", host, user); + send_cmd(NULL, "RAKILL %s %s", host, user); } /* PART */ @@ -1602,7 +1602,6 @@ void viagra_cmd_ctcp(char *source, char *dest, char *buf) **/ void moduleAddAnopeCmds() { - pmodule_cmd_remove_akill(viagra_cmd_remove_akill); pmodule_cmd_topic(viagra_cmd_topic); pmodule_cmd_vhost_off(viagra_cmd_vhost_off); pmodule_cmd_akill(viagra_cmd_akill); diff --git a/src/protocol/viagra.h b/src/protocol/viagra.h index 5ef4a5cb2..be8c223cc 100644 --- a/src/protocol/viagra.h +++ b/src/protocol/viagra.h @@ -61,8 +61,6 @@ #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r void viagra_set_umode(User * user, int ac, char **av); -void viagra_cmd_svsnoop(char *server, int set); -void viagra_cmd_remove_akill(char *user, char *host); void viagra_cmd_topic(char *whosets, char *chan, char *whosetit, char *topic, time_t when); void viagra_cmd_vhost_off(User * u); void viagra_cmd_akill(char *user, char *host, char *who, time_t when,time_t expires, char *reason); @@ -134,4 +132,5 @@ void viagra_cmd_ctcp(char *source, char *dest, char *buf); class ViagraIRCdProto : public IRCDProtoNew { public: void cmd_svsnoop(const char *, int); + void cmd_remove_akill(const char *, const char *); } ircd_proto; |