Added cmd_svso() function to IRCDProtoNew class.

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

13 files changed, 6 insertions, 45 deletions

diff --git a/include/extern.h b/include/extern.h
index f5aadd689..316882e72 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_svso(void (*func) (const char *source, const char *nick, const char *flag));
 E void pmodule_cmd_chg_nick(void (*func) (const char *oldnick, const char *newnick));
 E void pmodule_cmd_svsnick(void (*func) (const char *source, const char *guest, time_t when));
 E void pmodule_cmd_vhost_on(void (*func) (const char *nick, const char *vIdent, const char *vhost));
diff --git a/include/services.h b/include/services.h
index f545e6e37..9c835c349 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_svso)(const char *source, const char *nick, const char *flag);
     void (*ircd_cmd_chg_nick)(const char *oldnick, const char *newnick);
     void (*ircd_cmd_svsnick)(const char *source, const char *guest, time_t when);
     void (*ircd_cmd_vhost_on)(const char *nick, const char *vIdent, const char *vhost);
@@ -1350,6 +1349,7 @@ class IRCDProtoNew {
 			if (!servname || !message) return;
 			send_cmd(NULL, "SQUIT %s :%s", servname, message);
 		}
+		virtual void cmd_svso(const char *, const char *, const char *) { }
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index a6c689e14..a65a99031 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_svso = NULL;
     ircdproto.ircd_cmd_chg_nick = NULL;
     ircdproto.ircd_cmd_svsnick = NULL;
     ircdproto.ircd_cmd_vhost_on = NULL;
@@ -477,7 +476,7 @@ void anope_cmd_squit(const char *servname, const char *message)
 
 void anope_cmd_svso(const char *source, const char *nick, const char *flag)
 {
-    ircdproto.ircd_cmd_svso(source, nick, flag);
+	ircdprotonew->cmd_svso(source, nick, flag);
 }
 
 void anope_cmd_chg_nick(const char *oldnick, const char *newnick)
@@ -710,11 +709,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_svso(void (*func) (const char *source, const char *nick, const char *flag))
-{
-    ircdproto.ircd_cmd_svso = func;
-}
-
 void pmodule_cmd_chg_nick(void (*func) (const char *oldnick, const char *newnick))
 {
     ircdproto.ircd_cmd_chg_nick = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index bd3184c23..95dda5622 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1203,11 +1203,6 @@ void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const
 	send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, user, host, ServerName, real);
 }
 
-void bahamut_cmd_svso(const char *source, const char *nick, const char *flag)
-{
-    /* Not Supported by this IRCD */
-}
-
 void bahamut_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
     /* Not Supported by this IRCD */
@@ -1437,7 +1432,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_svso(bahamut_cmd_svso);
     pmodule_cmd_chg_nick(bahamut_cmd_chg_nick);
     pmodule_cmd_svsnick(bahamut_cmd_svsnick);
     pmodule_cmd_vhost_on(bahamut_cmd_vhost_on);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 9002037ee..b9a4e8ee6 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_svso(const char *source, const char *nick, const char *flag);
 void bahamut_cmd_chg_nick(const char *oldnick, const char *newnick);
 void bahamut_cmd_svsnick(const char *source, const char *guest, time_t when);
 void bahamut_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index e5bee142e..8b60d6594 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1448,11 +1448,6 @@ void charybdis_cmd_svsnick(const char *nick, const char *newnick, time_t when)
              u->nick, newnick, (long int)when, (long int)u->timestamp);
 }
 
-void charybdis_cmd_svso(const char *source, const char *nick, const char *flag)
-{
-    /* Not Supported by this IRCD */
-}
-
 void charybdis_cmd_unban(const char *name, const char *nick)
 {
     /* Not Supported by this IRCD */
@@ -1702,7 +1697,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_svso(charybdis_cmd_svso);
     pmodule_cmd_chg_nick(charybdis_cmd_chg_nick);
     pmodule_cmd_svsnick(charybdis_cmd_svsnick);
     pmodule_cmd_vhost_on(charybdis_cmd_vhost_on);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 2d5b391d2..1946990a6 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_svso(const char *source, const char *nick, const char *flag);
 void charybdis_cmd_chg_nick(const char *oldnick, const char *newnick);
 void charybdis_cmd_svsnick(const char *source, const char *guest, time_t when);
 void charybdis_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 058ff82da..81a1d69e0 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -975,11 +975,6 @@ void InspIRCdProto::cmd_squit(const char *servname, const char *message)
 	send_cmd(ServerName, "SQUIT %s :%s", servname, message);
 }
 
-/* SVSO */
-void inspircd_cmd_svso(const char *source, const char *nick, const char *flag)
-{
-}
-
 /* NICK <newnick>  */
 void inspircd_cmd_chg_nick(const char *oldnick, const char *newnick)
 {
@@ -1688,7 +1683,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_svso(inspircd_cmd_svso);
     pmodule_cmd_chg_nick(inspircd_cmd_chg_nick);
     pmodule_cmd_svsnick(inspircd_cmd_svsnick);
     pmodule_cmd_vhost_on(inspircd_cmd_vhost_on);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index a6a47ef13..922e24fc9 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_svso(const char *source, const char *nick, const char *flag);
 void inspircd_cmd_chg_nick(const char *oldnick, const char *newnick);
 void inspircd_cmd_svsnick(const char *source, const char *guest, time_t when);
 void inspircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 62a50da56..50ac8e85b 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1369,11 +1369,6 @@ void ratbox_cmd_svsnick(const char *nick, const char *newnick, time_t when)
     /* not supported */
 }
 
-void ratbox_cmd_svso(const char *source, const char *nick, const char *flag)
-{
-    /* Not Supported by this IRCD */
-}
-
 void ratbox_cmd_unban(const char *name, const char *nick)
 {
     /* Not Supported by this IRCD */
@@ -1595,7 +1590,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_svso(ratbox_cmd_svso);
     pmodule_cmd_chg_nick(ratbox_cmd_chg_nick);
     pmodule_cmd_svsnick(ratbox_cmd_svsnick);
     pmodule_cmd_vhost_on(ratbox_cmd_vhost_on);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 84eb67b66..a97164de9 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_svso(const char *source, const char *nick, const char *flag);
 void ratbox_cmd_chg_nick(const char *oldnick, const char *newnick);
 void ratbox_cmd_svsnick(const char *source, const char *guest, time_t when);
 void ratbox_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 9480dcba5..2b1c9ed3e 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -877,13 +877,10 @@ void UnrealIRCdProto::cmd_sqline(const char *mask, const char *reason)
 **      parv[1] = nick
 **      parv[2] = options
 */
-void unreal_cmd_svso(const char *source, const char *nick, const char *flag)
+void UnrealIRCdProto::cmd_svso(const char *source, const char *nick, const char *flag)
 {
-    if (!source || !nick || !flag) {
-        return;
-    }
-
-    send_cmd(source, "%s %s %s", send_token("SVSO", "BB"), nick, flag);
+	if (!source || !nick || !flag) return;
+	send_cmd(source, "%s %s %s", send_token("SVSO", "BB"), nick, flag);
 }
 
 /* NICK <newnick>  */
@@ -1979,7 +1976,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_svso(unreal_cmd_svso);
     pmodule_cmd_chg_nick(unreal_cmd_chg_nick);
     pmodule_cmd_svsnick(unreal_cmd_svsnick);
     pmodule_cmd_vhost_on(unreal_cmd_vhost_on);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index fbe83acb4..e7d750cea 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_svso(const char *source, const char *nick, const char *flag);
 void unreal_cmd_chg_nick(const char *oldnick, const char *newnick);
 void unreal_cmd_svsnick(const char *source, const char *guest, time_t when);
 void unreal_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
@@ -140,4 +139,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_join(const char *, const char *, time_t);
 		void cmd_unsqline(const char *);
 		void cmd_sqline(const char *, const char *);
+		void cmd_svso(const char *, const char *, const char *);
 } ircd_proto;