diff options
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | include/services.h | 9 | ||||
| -rw-r--r-- | src/ircd.c | 9 | ||||
| -rw-r--r-- | src/protocol/bahamut.c | 14 | ||||
| -rw-r--r-- | src/protocol/bahamut.h | 1 | ||||
| -rw-r--r-- | src/protocol/charybdis.c | 14 | ||||
| -rw-r--r-- | src/protocol/charybdis.h | 1 | ||||
| -rw-r--r-- | src/protocol/inspircd11.c | 14 | ||||
| -rwxr-xr-x | src/protocol/inspircd11.h | 1 | ||||
| -rw-r--r-- | src/protocol/ratbox.c | 14 | ||||
| -rw-r--r-- | src/protocol/ratbox.h | 1 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 14 | ||||
| -rw-r--r-- | src/protocol/unreal32.h | 1 |
13 files changed, 9 insertions, 85 deletions
diff --git a/include/extern.h b/include/extern.h index 7901245d4..5bbb39540 100644 --- a/include/extern.h +++ b/include/extern.h @@ -623,7 +623,6 @@ E void pmodule_cmd_318(void (*func) (const char *source, const char *who)); E void pmodule_cmd_242(void (*func) (const char *buf)); E void pmodule_cmd_243(void (*func) (const char *buf)); E void pmodule_cmd_211(void (*func) (const char *buf)); -E void pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason)); E void pmodule_set_umode(void (*func) (User * user, int ac, const char **av)); E void pmodule_valid_nick(int (*func) (const char *nick)); E void pmodule_valid_chan(int (*func) (const char *chan)); diff --git a/include/services.h b/include/services.h index c9f0d549f..58d24bc8f 100644 --- a/include/services.h +++ b/include/services.h @@ -1073,7 +1073,6 @@ typedef struct ircd_proto_ { void (*ircd_cmd_242)(const char *buf); void (*ircd_cmd_243)(const char *buf); void (*ircd_cmd_211)(const char *buf); - void (*ircd_cmd_jupe)(const char *jserver, const char *who, const char *reason); void (*ircd_set_umode)(User *user, int ac, const char **av); int (*ircd_valid_nick)(const char *nick); int (*ircd_valid_chan)(const char *chan); @@ -1365,6 +1364,14 @@ class IRCDProtoNew { virtual void cmd_swhois(const char *, const char *, const char *) { } virtual void cmd_eob() { } virtual void cmd_server(const char *, int, const char *) = 0; + virtual void cmd_jupe(const char *jserver, const char *who, const char *reason) + { + char rbuf[256]; + snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, reason ? ": " : "", reason ? reason : ""); + if (findserver(servlist, jserver)) cmd_squit(jserver, rbuf); + cmd_server(jserver, 2, rbuf); + new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); + } }; /*************************************************************************/ diff --git a/src/ircd.c b/src/ircd.c index 05fae4f13..11eb32293 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -64,7 +64,6 @@ void initIrcdProto() ircdproto.ircd_cmd_243 = NULL; ircdproto.ircd_cmd_211 = NULL; ircdproto.ircd_flood_mode_check = NULL; - ircdproto.ircd_cmd_jupe = NULL; ircdproto.ircd_valid_nick = NULL; ircdproto.ircd_valid_chan = NULL; } @@ -565,7 +564,7 @@ int anope_flood_mode_check(const char *value) void anope_cmd_jupe(const char *jserver, const char *who, const char *reason) { - ircdproto.ircd_cmd_jupe(jserver, who, reason); + ircdprotonew->cmd_jupe(jserver, who, reason); } int anope_valid_nick(const char *nick) @@ -687,12 +686,6 @@ void pmodule_cmd_211(void (*func) (const char *buf)) ircdproto.ircd_cmd_211 = func; } -void -pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason)) -{ - ircdproto.ircd_cmd_jupe = func; -} - void pmodule_set_umode(void (*func) (User * user, int ac, const char **av)) { ircdproto.ircd_set_umode = func; diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index b3a52bdfe..fbb67d791 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -1287,19 +1287,6 @@ int bahamut_flood_mode_check(const char *value) } } -void bahamut_cmd_jupe(const char *jserver, const char *who, const char *reason) -{ - char rbuf[256]; - - snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, - reason ? ": " : "", reason ? reason : ""); - - if (findserver(servlist, jserver)) - ircd_proto.cmd_squit(jserver, rbuf); - ircd_proto.cmd_server(jserver, 2, rbuf); - new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); -} - /* 1 = valid nick 0 = nick is in valid @@ -1353,7 +1340,6 @@ void moduleAddAnopeCmds() pmodule_cmd_243(bahamut_cmd_243); pmodule_cmd_211(bahamut_cmd_211); pmodule_flood_mode_check(bahamut_flood_mode_check); - pmodule_cmd_jupe(bahamut_cmd_jupe); pmodule_valid_nick(bahamut_valid_nick); pmodule_valid_chan(bahamut_valid_chan); pmodule_set_umode(bahamut_set_umode); diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h index 6f5a532bb..82cbf560e 100644 --- a/src/protocol/bahamut.h +++ b/src/protocol/bahamut.h @@ -77,7 +77,6 @@ void bahamut_cmd_242(const char *buf); void bahamut_cmd_243(const char *buf); void bahamut_cmd_211(const char *buf); int bahamut_flood_mode_check(const char *value); -void bahamut_cmd_jupe(const char *jserver, const char *who, const char *reason); int bahamut_valid_nick(const char *nick); class BahamutIRCdProto : public IRCDProtoNew { diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index 2d1f80d99..095c9ab6c 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -1506,19 +1506,6 @@ int anope_event_error(const char *source, int ac, const char **av) return MOD_CONT; } -void charybdis_cmd_jupe(const char *jserver, const char *who, const char *reason) -{ - char rbuf[256]; - - snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, - reason ? ": " : "", reason ? reason : ""); - - if (findserver(servlist, jserver)) - ircd_proto.cmd_squit(jserver, rbuf); - ircd_proto.cmd_server(jserver, 2, rbuf); - new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); -} - /* 1 = valid nick 0 = nick is in valid @@ -1584,7 +1571,6 @@ void moduleAddAnopeCmds() pmodule_cmd_243(charybdis_cmd_243); pmodule_cmd_211(charybdis_cmd_211); pmodule_flood_mode_check(charybdis_flood_mode_check); - pmodule_cmd_jupe(charybdis_cmd_jupe); pmodule_valid_nick(charybdis_valid_nick); pmodule_valid_chan(charybdis_valid_chan); pmodule_set_umode(charybdis_set_umode); diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h index c97c7d8ca..987489ac8 100644 --- a/src/protocol/charybdis.h +++ b/src/protocol/charybdis.h @@ -65,7 +65,6 @@ void charybdis_cmd_242(const char *buf); void charybdis_cmd_243(const char *buf); void charybdis_cmd_211(const char *buf); int charybdis_flood_mode_check(const char *value); -void charybdis_cmd_jupe(const char *jserver, const char *who, const char *reason); int charybdis_valid_nick(const char *nick); class CharybdisProto : public IRCDProtoNew { diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index c08218fb8..1dc7fd785 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1536,19 +1536,6 @@ int inspircd_flood_mode_check(const char *value) } } -void inspircd_cmd_jupe(const char *jserver, const char *who, const char *reason) -{ - char rbuf[256]; - - snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, - reason ? ": " : "", reason ? reason : ""); - - if (findserver(servlist, jserver)) - ircd_proto.cmd_squit(jserver, rbuf); - ircd_proto.cmd_server(jserver, 1, rbuf); - new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); -} - int inspircd_valid_nick(const char *nick) { return 1; @@ -1584,7 +1571,6 @@ void moduleAddAnopeCmds() pmodule_cmd_243(inspircd_cmd_243); pmodule_cmd_211(inspircd_cmd_211); pmodule_flood_mode_check(inspircd_flood_mode_check); - pmodule_cmd_jupe(inspircd_cmd_jupe); pmodule_valid_nick(inspircd_valid_nick); pmodule_valid_chan(inspircd_valid_chan); pmodule_set_umode(inspircd_set_umode); diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h index a0b5dc7cb..345f70640 100755 --- a/src/protocol/inspircd11.h +++ b/src/protocol/inspircd11.h @@ -70,7 +70,6 @@ void inspircd_cmd_242(const char *buf); void inspircd_cmd_243(const char *buf); void inspircd_cmd_211(const char *buf); int inspircd_flood_mode_check(const char *value); -void inspircd_cmd_jupe(const char *jserver, const char *who, const char *reason); int inspircd_valid_nick(const char *nick); int anope_event_fjoin(const char *source, int ac, const char **av); int anope_event_fmode(const char *source, int ac, const char **av); diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index aab1d63a8..3666f7ec3 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -1401,19 +1401,6 @@ int anope_event_error(const char *source, int ac, const char **av) return MOD_CONT; } -void ratbox_cmd_jupe(const char *jserver, const char *who, const char *reason) -{ - char rbuf[256]; - - snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, - reason ? ": " : "", reason ? reason : ""); - - if (findserver(servlist, jserver)) - ircd_proto.cmd_squit(jserver, rbuf); - ircd_proto.cmd_server(jserver, 2, rbuf); - new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); -} - /* 1 = valid nick 0 = nick is in valid @@ -1461,7 +1448,6 @@ void moduleAddAnopeCmds() pmodule_cmd_243(ratbox_cmd_243); pmodule_cmd_211(ratbox_cmd_211); pmodule_flood_mode_check(ratbox_flood_mode_check); - pmodule_cmd_jupe(ratbox_cmd_jupe); pmodule_valid_nick(ratbox_valid_nick); pmodule_valid_chan(ratbox_valid_chan); pmodule_set_umode(ratbox_set_umode); diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h index 878002445..d86c037a5 100644 --- a/src/protocol/ratbox.h +++ b/src/protocol/ratbox.h @@ -64,7 +64,6 @@ void ratbox_cmd_242(const char *buf); void ratbox_cmd_243(const char *buf); void ratbox_cmd_211(const char *buf); int ratbox_flood_mode_check(const char *value); -void ratbox_cmd_jupe(const char *jserver, const char *who, const char *reason); int ratbox_valid_nick(const char *nick); class RatboxProto : public IRCDProtoNew { diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 9d53672fc..c43afaaa5 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -1580,19 +1580,6 @@ int unreal_flood_mode_check(const char *value) } } -void unreal_cmd_jupe(const char *jserver, const char *who, const char *reason) -{ - char rbuf[256]; - - snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who, - reason ? ": " : "", reason ? reason : ""); - - if (findserver(servlist, jserver)) - ircd_proto.cmd_squit(jserver, rbuf); - ircd_proto.cmd_server(jserver, 2, rbuf); - new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL); -} - /* 1 = valid nick 0 = nick is in valid @@ -1897,7 +1884,6 @@ void moduleAddAnopeCmds() pmodule_cmd_243(unreal_cmd_243); pmodule_cmd_211(unreal_cmd_211); pmodule_flood_mode_check(unreal_flood_mode_check); - pmodule_cmd_jupe(unreal_cmd_jupe); pmodule_valid_nick(unreal_valid_nick); pmodule_valid_chan(unreal_valid_chan); pmodule_set_umode(unreal_set_umode); diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h index 6ffc0e9b5..dc08bad0d 100644 --- a/src/protocol/unreal32.h +++ b/src/protocol/unreal32.h @@ -99,7 +99,6 @@ void unreal_cmd_242(const char *buf); void unreal_cmd_243(const char *buf); void unreal_cmd_211(const char *buf); int unreal_flood_mode_check(const char *value); -void unreal_cmd_jupe(const char *jserver, const char *who, const char *reason); int unreal_valid_nick(const char *nick); class UnrealIRCdProto : public IRCDProtoNew { |