Added cmd_svid_umode() function to IRCDProtoNew class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1258 5417fbe8-f217-4b02-8779-1006273d7864

13 files changed, 9 insertions, 52 deletions

diff --git a/include/extern.h b/include/extern.h
index 00ee9bf02..07ac4d2d0 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_svid_umode(void (*func) (const char *nick, time_t ts));
 E void pmodule_cmd_nc_change(void (*func) (User * u));
 E void pmodule_cmd_svid_umode2(void (*func) (User * u, const char *ts));
 E void pmodule_cmd_svid_umode3(void (*func) (User * u, const char *ts));
diff --git a/include/services.h b/include/services.h
index 7b694f844..1478bf18f 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_svid_umode)(const char *nick, time_t ts);
     void (*ircd_cmd_nc_change)(User * u);
     void (*ircd_cmd_svid_umode2)(User * u, const char *ts);
     void (*ircd_cmd_svid_umode3)(User * u, const char *ts);
@@ -1358,6 +1357,7 @@ class IRCDProtoNew {
 		virtual void cmd_sgline(const char *, const char *) { }
 		virtual void cmd_unban(const char *, const char *) { }
 		virtual void cmd_svsmode_chan(const char *, const char *, const char *) { }
+		virtual void cmd_svid_umode(const char *, time_t) { }
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index 2445b5c6e..a5bf448ce 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_umode = NULL;
     ircdproto.ircd_cmd_nc_change = NULL;
     ircdproto.ircd_cmd_svid_umode2 = NULL;
     ircdproto.ircd_cmd_svid_umode3 = NULL;
@@ -529,7 +528,7 @@ void anope_cmd_svsmode_chan(const char *name, const char *mode, const char *nick
 
 void anope_cmd_svid_umode(const char *nick, time_t ts)
 {
-    ircdproto.ircd_cmd_svid_umode(nick, ts);
+	ircdprotonew->cmd_svid_umode(nick, ts);
 }
 
 void anope_cmd_nc_change(User * u)
@@ -697,11 +696,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_svid_umode(void (*func) (const char *nick, time_t ts))
-{
-    ircdproto.ircd_cmd_svid_umode = func;
-}
-
 void pmodule_cmd_nc_change(void (*func) (User * u))
 {
     ircdproto.ircd_cmd_nc_change = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 4394877ac..752867263 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1180,10 +1180,9 @@ void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void bahamut_cmd_svid_umode(const char *nick, time_t ts)
+void BahamutIRCdProto::cmd_svid_umode(const char *nick, time_t ts)
 {
-    send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick,
-             (unsigned long int) ts);
+	send_cmd(ServerName, "SVSMODE %s %lu +d 1", nick, static_cast<unsigned long>(ts));
 }
 
 
@@ -1392,7 +1391,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_svid_umode(bahamut_cmd_svid_umode);
     pmodule_cmd_nc_change(bahamut_cmd_nc_change);
     pmodule_cmd_svid_umode2(bahamut_cmd_svid_umode2);
     pmodule_cmd_svid_umode3(bahamut_cmd_svid_umode3);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 2f0c0ddea..1d5d1cdb1 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_umode(const char *nick, time_t ts);
 void bahamut_cmd_nc_change(User * u);
 void bahamut_cmd_svid_umode2(User * u, const char *ts);
 void bahamut_cmd_svid_umode3(User * u, const char *ts);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_sgline(const char *, const char *);
 		void cmd_unban(const char *, const char *);
 		void cmd_svsmode_chan(const char *, const char *, const char *);
+		void cmd_svid_umode(const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 15d07e36b..895f01196 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1416,13 +1416,6 @@ void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_
 }
 
 /* SVSMODE +d */
-/* sent if svid is something weird */
-void charybdis_cmd_svid_umode(const char *nick, time_t ts)
-{
-    /* not supported */
-}
-
-/* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
 void charybdis_cmd_nc_change(User * u)
 {
@@ -1642,7 +1635,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_svid_umode(charybdis_cmd_svid_umode);
     pmodule_cmd_nc_change(charybdis_cmd_nc_change);
     pmodule_cmd_svid_umode2(charybdis_cmd_svid_umode2);
     pmodule_cmd_svid_umode3(charybdis_cmd_svid_umode3);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 605058dbb..4312f6036 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_umode(const char *nick, time_t ts);
 void charybdis_cmd_nc_change(User * u);
 void charybdis_cmd_svid_umode2(User * u, const char *ts);
 void charybdis_cmd_svid_umode3(User * u, const char *ts);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index dfdc28e87..7bf70b45b 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1480,14 +1480,6 @@ void inspircd_cmd_szline(const char *mask, const char *reason, const char *whom)
 }
 
 /* SVSMODE +d */
-/* sent if svid is something weird */
-void inspircd_cmd_svid_umode(const char *nick, time_t ts)
-{
-    if (debug)
-        alog("debug: common_svsmode(0)");
-}
-
-/* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
 void inspircd_cmd_nc_change(User * u)
 {
@@ -1621,7 +1613,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_svid_umode(inspircd_cmd_svid_umode);
     pmodule_cmd_nc_change(inspircd_cmd_nc_change);
     pmodule_cmd_svid_umode2(inspircd_cmd_svid_umode2);
     pmodule_cmd_svid_umode3(inspircd_cmd_svid_umode3);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 2949c62a4..f91b65296 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_umode(const char *nick, time_t ts);
 void inspircd_cmd_nc_change(User * u);
 void inspircd_cmd_svid_umode2(User * u, const char *ts);
 void inspircd_cmd_svid_umode3(User * u, const char *ts);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index d188dc535..66049896f 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1322,13 +1322,6 @@ int anope_event_capab(const char *source, int ac, const char **av)
 }
 
 /* SVSMODE +d */
-/* sent if svid is something weird */
-void ratbox_cmd_svid_umode(const char *nick, time_t ts)
-{
-    /* not supported */
-}
-
-/* SVSMODE +d */
 /* nc_change was = 1, and there is no na->status */
 void ratbox_cmd_nc_change(User * u)
 {
@@ -1520,7 +1513,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_svid_umode(ratbox_cmd_svid_umode);
     pmodule_cmd_nc_change(ratbox_cmd_nc_change);
     pmodule_cmd_svid_umode2(ratbox_cmd_svid_umode2);
     pmodule_cmd_svid_umode3(ratbox_cmd_svid_umode3);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 841fca049..2c5771a4d 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_umode(const char *nick, time_t ts);
 void ratbox_cmd_nc_change(User * u);
 void ratbox_cmd_svid_umode2(User * u, const char *ts);
 void ratbox_cmd_svid_umode3(User * u, const char *ts);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 695a6d324..bbc2f47c4 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1401,15 +1401,10 @@ void UnrealIRCdProto::cmd_svsmode_chan(const char *name, const char *mode, const
 
 /* SVSMODE +d */
 /* sent if svid is something weird */
-void unreal_cmd_svid_umode(const char *nick, time_t ts)
+void UnrealIRCdProto::cmd_svid_umode(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);
-    }
+	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);
 }
 
 /* SVSMODE +d */
@@ -1929,7 +1924,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_svid_umode(unreal_cmd_svid_umode);
     pmodule_cmd_nc_change(unreal_cmd_nc_change);
     pmodule_cmd_svid_umode2(unreal_cmd_svid_umode2);
     pmodule_cmd_svid_umode3(unreal_cmd_svid_umode3);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 0cf8cf572..681bdf92f 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_umode(const char *nick, time_t ts);
 void unreal_cmd_nc_change(User * u);
 void unreal_cmd_svid_umode2(User * u, const char *ts);
 void unreal_cmd_svid_umode3(User * u, const char *ts);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_sgline(const char *, const char *);
 		void cmd_unban(const char *, const char *);
 		void cmd_svsmode_chan(const char *, const char *, const char *);
+		void cmd_svid_umode(const char *, time_t);
 } ircd_proto;