summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ircd.c10
-rw-r--r--src/protocol/bahamut.c8
-rw-r--r--src/protocol/bahamut.h1
-rw-r--r--src/protocol/charybdis.c7
-rw-r--r--src/protocol/charybdis.h1
-rw-r--r--src/protocol/inspircd11.c7
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c7
-rw-r--r--src/protocol/ratbox.h1
-rw-r--r--src/protocol/unreal32.c10
-rw-r--r--src/protocol/unreal32.h2
11 files changed, 9 insertions, 47 deletions
diff --git a/src/ircd.c b/src/ircd.c
index d07da44a8..2ecf0f3f0 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_svid_umode2 = NULL;
ircdproto.ircd_cmd_svid_umode3 = NULL;
ircdproto.ircd_cmd_svsjoin = NULL;
ircdproto.ircd_cmd_svspart = NULL;
@@ -535,9 +534,9 @@ void anope_cmd_nc_change(User *u)
ircdprotonew->cmd_nc_change(u);
}
-void anope_cmd_svid_umode2(User * u, const char *ts)
+void anope_cmd_svid_umode2(User *u, const char *ts)
{
- ircdproto.ircd_cmd_svid_umode2(u, ts);
+ ircdprotonew->cmd_svid_umode2(u, ts);
}
void anope_cmd_svid_umode3(User * u, const char *ts)
@@ -695,11 +694,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
-void pmodule_cmd_svid_umode2(void (*func) (User * u, const char *ts))
-{
- ircdproto.ircd_cmd_svid_umode2 = func;
-}
-
void pmodule_cmd_svid_umode3(void (*func) (User * u, const char *ts))
{
ircdproto.ircd_cmd_svid_umode3 = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index b9503a2ac..e73e1f148 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1193,13 +1193,6 @@ void BahamutIRCdProto::cmd_nc_change(User *u)
common_svsmode(u, "+d", "1");
}
-/* SVSMODE +d */
-void bahamut_cmd_svid_umode2(User * u, const char *ts)
-{
- /* not used by bahamut ircds */
-}
-
-
void bahamut_cmd_svid_umode3(User * u, const char *ts)
{
if (u->svid != u->timestamp) {
@@ -1391,7 +1384,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
- pmodule_cmd_svid_umode2(bahamut_cmd_svid_umode2);
pmodule_cmd_svid_umode3(bahamut_cmd_svid_umode3);
pmodule_cmd_svsjoin(bahamut_cmd_svsjoin);
pmodule_cmd_svspart(bahamut_cmd_svspart);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index e990d8ea0..572cd186a 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_svid_umode2(User * u, const char *ts);
void bahamut_cmd_svid_umode3(User * u, const char *ts);
void bahamut_cmd_eob();
int bahamut_flood_mode_check(const char *value);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6b398601c..538eebe91 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1415,12 +1415,6 @@ void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_
send_cmd(NULL, "ENCAP %s RSFNC %s %s %ld %ld", u->server->name, u->nick, newnick, static_cast<long>(when), static_cast<long>(u->timestamp));
}
-/* SVSMODE +d */
-void charybdis_cmd_svid_umode2(User * u, const char *ts)
-{
- /* not supported */
-}
-
void charybdis_cmd_svid_umode3(User * u, const char *ts)
{
/* not used */
@@ -1628,7 +1622,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
- pmodule_cmd_svid_umode2(charybdis_cmd_svid_umode2);
pmodule_cmd_svid_umode3(charybdis_cmd_svid_umode3);
pmodule_cmd_svsjoin(charybdis_cmd_svsjoin);
pmodule_cmd_svspart(charybdis_cmd_svspart);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 8b44d7aa4..d3c03e97a 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_svid_umode2(User * u, const char *ts);
void charybdis_cmd_svid_umode3(User * u, const char *ts);
void charybdis_cmd_eob();
int charybdis_flood_mode_check(const char *value);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 118b24f07..93462c315 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1487,11 +1487,9 @@ void InspIRCdProto::cmd_nc_change(User *u)
}
/* SVSMODE +r */
-void inspircd_cmd_svid_umode2(User * u, const char *ts)
+void InspIRCdProto::cmd_svid_umode2(User *u, const char *ts)
{
- if (debug)
- alog("debug: common_svsmode(2)");
- common_svsmode(u, "+r", NULL);
+ common_svsmode(u, "+r", NULL);
}
void inspircd_cmd_svid_umode3(User * u, const char *ts)
@@ -1611,7 +1609,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
- pmodule_cmd_svid_umode2(inspircd_cmd_svid_umode2);
pmodule_cmd_svid_umode3(inspircd_cmd_svid_umode3);
pmodule_cmd_svsjoin(inspircd_cmd_svsjoin);
pmodule_cmd_svspart(inspircd_cmd_svspart);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 0e0fbd9e4..6a864f1a6 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_svid_umode2(User * u, const char *ts);
void inspircd_cmd_svid_umode3(User * u, const char *ts);
void inspircd_cmd_eob();
int inspircd_flood_mode_check(const char *value);
@@ -114,4 +113,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_unszline(const char *);
void cmd_szline(const char *, const char *, const char *);
void cmd_nc_change(User *);
+ void cmd_svid_umode2(User *, const char *);
} ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 03bc09e56..64bb8e04c 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1321,12 +1321,6 @@ int anope_event_capab(const char *source, int ac, const char **av)
return MOD_CONT;
}
-/* SVSMODE +d */
-void ratbox_cmd_svid_umode2(User * u, const char *ts)
-{
- /* not supported */
-}
-
void ratbox_cmd_svid_umode3(User * u, const char *ts)
{
/* not used */
@@ -1506,7 +1500,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
- pmodule_cmd_svid_umode2(ratbox_cmd_svid_umode2);
pmodule_cmd_svid_umode3(ratbox_cmd_svid_umode3);
pmodule_cmd_svsjoin(ratbox_cmd_svsjoin);
pmodule_cmd_svspart(ratbox_cmd_svspart);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 175a00d33..b627d5dce 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_svid_umode2(User * u, const char *ts);
void ratbox_cmd_svid_umode3(User * u, const char *ts);
void ratbox_cmd_eob();
int ratbox_flood_mode_check(const char *value);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 72589ad90..bcfe96ac1 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1415,13 +1415,10 @@ void UnrealIRCdProto::cmd_nc_change(User *u)
}
/* SVSMODE +r */
-void unreal_cmd_svid_umode2(User * u, const char *ts)
+void UnrealIRCdProto::cmd_svid_umode2(User *u, const char *ts)
{
- if (u->svid != u->timestamp) {
- common_svsmode(u, "+rd", ts);
- } else {
- common_svsmode(u, "+r", NULL);
- }
+ if (u->svid != u->timestamp) common_svsmode(u, "+rd", ts);
+ else common_svsmode(u, "+r", NULL);
}
void unreal_cmd_svid_umode3(User * u, const char *ts)
@@ -1924,7 +1921,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
- pmodule_cmd_svid_umode2(unreal_cmd_svid_umode2);
pmodule_cmd_svid_umode3(unreal_cmd_svid_umode3);
pmodule_cmd_svsjoin(unreal_cmd_svsjoin);
pmodule_cmd_svspart(unreal_cmd_svspart);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 1d98b972c..e1e0b2d5d 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_svid_umode2(User * u, const char *ts);
void unreal_cmd_svid_umode3(User * u, const char *ts);
void unreal_cmd_eob();
int unreal_flood_mode_check(const char *value);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_svsmode_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 *);
} ircd_proto;