Added cmd_svsnoop function to IRCDProtoNew class.

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

32 files changed, 46 insertions, 104 deletions

diff --git a/include/extern.h b/include/extern.h
index 8b371167c..814e3f11b 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -610,7 +610,6 @@ E int servernum;
 /**** ircd.c ****/
 E void pmodule_ircd_proto(IRCDProtoNew *);
 E void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av));
-E void pmodule_cmd_svsnoop(void (*func) (const char *server, int set));
 E void pmodule_cmd_remove_akill(void (*func) (const char *user, const char *host));
 E void pmodule_cmd_topic(void (*func) (const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when));
 E void pmodule_cmd_vhost_off(void (*func) (User * u));
diff --git a/include/services.h b/include/services.h
index 09ee7b2a7..d7385e79d 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1081,7 +1081,6 @@ struct session_ {
  **/
 typedef struct ircd_proto_ {
     void (*ircd_set_mod_current_buffer)(int ac, char **av);
-    void (*ircd_cmd_svsnoop)(const char *server, int set);
     void (*ircd_cmd_remove_akill)(const char *user, const char *host);
     void (*ircd_cmd_topic)(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
     void (*ircd_cmd_vhost_off)(User * u);
@@ -1159,6 +1158,7 @@ typedef struct ircd_proto_ {
 
 class IRCDProtoNew {
 	public:
+		virtual void cmd_svsnoop(const char *, int) { }
 };
 
 typedef struct ircd_modes_ {
diff --git a/src/ircd.c b/src/ircd.c
index 1d9c46d96..450767e67 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_svsnoop = NULL;
     ircdproto.ircd_cmd_remove_akill = NULL;
     ircdproto.ircd_cmd_topic = NULL;
     ircdproto.ircd_cmd_vhost_off = NULL;
@@ -139,7 +138,7 @@ void anope_set_umode(User * user, int ac, const char **av)
 
 void anope_cmd_svsnoop(const char *server, int set)
 {
-    ircdproto.ircd_cmd_svsnoop(server, set);
+    ircdprotonew->cmd_svsnoop(server, set);
 }
 
 void anope_cmd_remove_akill(const char *user, const char *host)
@@ -704,11 +703,6 @@ void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av))
     ircdproto.ircd_set_mod_current_buffer = func;
 }
 
-void pmodule_cmd_svsnoop(void (*func) (const char *server, int set))
-{
-    ircdproto.ircd_cmd_svsnoop = func;
-}
-
 void pmodule_cmd_remove_akill(void (*func) (const char *user, const char *host))
 {
     ircdproto.ircd_cmd_remove_akill = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 201fc4ee9..bae334257 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -731,14 +731,14 @@ void bahamut_cmd_szline(char *mask, char *reason, char *whom)
 }
 
 /* SVSNOOP */
-void bahamut_cmd_svsnoop(char *server, int set)
+void BahamutIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void bahamut_cmd_svsadmin(char *server, int set)
 {
-    bahamut_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 /* SGLINE */
@@ -1565,7 +1565,6 @@ void bahamut_cmd_chghost(char *nick, char *vhost)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(bahamut_cmd_svsnoop);
     pmodule_cmd_remove_akill(bahamut_cmd_remove_akill);
     pmodule_cmd_topic(bahamut_cmd_topic);
     pmodule_cmd_vhost_off(bahamut_cmd_vhost_off);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 9ccafb15d..1a6270c4d 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -131,4 +131,5 @@ void bahamut_cmd_ctcp(char *source, char *dest, char *buf);
 
 class BahamutIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 465dc240d..c3f194fbf 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -846,14 +846,8 @@ void charybdis_cmd_szline(char *mask, char *reason, char *whom)
     /* not supported */
 }
 
-void charybdis_cmd_svsnoop(char *server, int set)
-{
-    /* does not support */
-}
-
 void charybdis_cmd_svsadmin(char *server, int set)
 {
-    charybdis_cmd_svsnoop(server, set);
 }
 
 void charybdis_cmd_sgline(char *mask, char *reason)
@@ -1873,7 +1867,6 @@ int charybdis_send_deaccount(int argc, char **argv)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(charybdis_cmd_svsnoop);
     pmodule_cmd_remove_akill(charybdis_cmd_remove_akill);
     pmodule_cmd_topic(charybdis_cmd_topic);
     pmodule_cmd_vhost_off(charybdis_cmd_vhost_off);
diff --git a/src/protocol/dreamforge.c b/src/protocol/dreamforge.c
index 3e0bf958d..a73573662 100644
--- a/src/protocol/dreamforge.c
+++ b/src/protocol/dreamforge.c
@@ -521,14 +521,14 @@ void dreamforge_cmd_sqline(char *mask, char *reason)
     send_cmd(NULL, "SQLINE %s :%s", mask, reason);
 }
 
-void dreamforge_cmd_svsnoop(char *server, int set)
+void DreamForgeProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void dreamforge_cmd_svsadmin(char *server, int set)
 {
-    dreamforge_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void dreamforge_cmd_remove_akill(char *user, char *host)
@@ -1270,7 +1270,6 @@ void dreamforge_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(dreamforge_cmd_svsnoop);
     pmodule_cmd_remove_akill(dreamforge_cmd_remove_akill);
     pmodule_cmd_topic(dreamforge_cmd_topic);
     pmodule_cmd_vhost_off(dreamforge_cmd_vhost_off);
diff --git a/src/protocol/dreamforge.h b/src/protocol/dreamforge.h
index fdd9035fc..d0baf22d1 100644
--- a/src/protocol/dreamforge.h
+++ b/src/protocol/dreamforge.h
@@ -111,4 +111,5 @@ void dreamforge_cmd_ctcp(char *source, char *dest, char *buf);
 
 class DreamForgeProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index a4102ccab..c624e7d19 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -679,14 +679,8 @@ void hybrid_cmd_szline(char *mask, char *reason, char *whom)
     /* Does not support */
 }
 
-void hybrid_cmd_svsnoop(char *server, int set)
-{
-    /* does not support */
-}
-
 void hybrid_cmd_svsadmin(char *server, int set)
 {
-    hybrid_cmd_svsnoop(server, set);
 }
 
 void hybrid_cmd_sgline(char *mask, char *reason)
@@ -1459,7 +1453,6 @@ void hybrid_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(hybrid_cmd_svsnoop);
     pmodule_cmd_remove_akill(hybrid_cmd_remove_akill);
     pmodule_cmd_topic(hybrid_cmd_topic);
     pmodule_cmd_vhost_off(hybrid_cmd_vhost_off);
diff --git a/src/protocol/inspircd10.c b/src/protocol/inspircd10.c
index 030cd6207..051f8fbe4 100644
--- a/src/protocol/inspircd10.c
+++ b/src/protocol/inspircd10.c
@@ -503,11 +503,6 @@ void moduleAddIRCDMsgs(void) {
 
 /* *INDENT-ON* */
 
-void inspircd_cmd_svsnoop(char *server, int set)
-{
-    /* Not Supported by this IRCD */
-}
-
 void inspircd_cmd_svsadmin(char *server, int set)
 {
     /* Not Supported by this IRCD */
@@ -1599,7 +1594,6 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(inspircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(inspircd_cmd_remove_akill);
     pmodule_cmd_topic(inspircd_cmd_topic);
     pmodule_cmd_vhost_off(inspircd_cmd_vhost_off);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 6416521b5..25cdf8d38 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -523,11 +523,6 @@ void moduleAddIRCDMsgs(void) {
 
 /* *INDENT-ON* */
 
-void inspircd_cmd_svsnoop(char *server, int set)
-{
-    /* Not Supported by this IRCD */
-}
-
 void inspircd_cmd_svsadmin(char *server, int set)
 {
     /* Not Supported by this IRCD */
@@ -1812,7 +1807,6 @@ void inspircd_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(inspircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(inspircd_cmd_remove_akill);
     pmodule_cmd_topic(inspircd_cmd_topic);
     pmodule_cmd_vhost_off(inspircd_cmd_vhost_off);
diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c
index f3d250ab5..7558597ab 100644
--- a/src/protocol/plexus2.c
+++ b/src/protocol/plexus2.c
@@ -802,15 +802,8 @@ plexus_cmd_szline (char *mask, char *reason, char *whom)
 }
 
 void
-plexus_cmd_svsnoop (char *server, int set)
-{
-  /* does not support */
-}
-
-void
 plexus_cmd_svsadmin (char *server, int set)
 {
-  plexus_cmd_svsnoop (server, set);
 }
 
 void
@@ -1763,7 +1756,6 @@ plexus_cmd_ctcp (char *source, char *dest, char *buf)
 void
 moduleAddAnopeCmds ()
 {
-  pmodule_cmd_svsnoop (plexus_cmd_svsnoop);
   pmodule_cmd_remove_akill (plexus_cmd_remove_akill);
   pmodule_cmd_topic (plexus_cmd_topic);
   pmodule_cmd_vhost_off (plexus_cmd_vhost_off);
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index 1f9fdb0a3..17b61fc21 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -776,17 +776,15 @@ plexus_cmd_szline (char *mask, char *reason, char *whom)
   /* Does not support */
 }
 
-void
-plexus_cmd_svsnoop (char *server, int set)
+void PleXusIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-  send_cmd(ServerName, "ENCAP %s SVSNOOP %s",
-           server, (set ? "+" : "-"));
+	send_cmd(ServerName, "ENCAP %s SVSNOOP %s", server, set ? "+" : "-");
 }
 
 void
 plexus_cmd_svsadmin (char *server, int set)
 {
-  plexus_cmd_svsnoop (server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void
@@ -1740,7 +1738,6 @@ plexus_cmd_ctcp (char *source, char *dest, char *buf)
 void
 moduleAddAnopeCmds ()
 {
-  pmodule_cmd_svsnoop (plexus_cmd_svsnoop);
   pmodule_cmd_remove_akill (plexus_cmd_remove_akill);
   pmodule_cmd_topic (plexus_cmd_topic);
   pmodule_cmd_vhost_off (plexus_cmd_vhost_off);
diff --git a/src/protocol/plexus3.h b/src/protocol/plexus3.h
index 07d10ad9d..e90ee525b 100644
--- a/src/protocol/plexus3.h
+++ b/src/protocol/plexus3.h
@@ -112,4 +112,5 @@ void plexus_cmd_ctcp(char *source, char *dest, char *buf);
 
 class PleXusIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index f17331976..2b37f56f9 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -680,14 +680,14 @@ void ptlink_cmd_sqline(char *mask, char *reason)
 	  operations:
 		noopers - remove existing opers and disable o:lines
 */
-void ptlink_cmd_svsnoop(char *server, int set)
+void PTlinkProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSADMIN %s :%s", server, set ? "noopers" : "rehash");
+	send_cmd(NULL, "SVSADMIN %s :%s", server, set ? "noopers" : "rehash");
 }
 
 void ptlink_cmd_svsadmin(char *server, int set)
 {
-    ptlink_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 /*
@@ -1682,7 +1682,6 @@ void ptlink_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(ptlink_cmd_svsnoop);
     pmodule_cmd_remove_akill(ptlink_cmd_remove_akill);
     pmodule_cmd_topic(ptlink_cmd_topic);
     pmodule_cmd_vhost_off(ptlink_cmd_vhost_off);
diff --git a/src/protocol/ptlink.h b/src/protocol/ptlink.h
index b09218fca..e9e8a1751 100644
--- a/src/protocol/ptlink.h
+++ b/src/protocol/ptlink.h
@@ -151,4 +151,5 @@ void ptlink_cmd_ctcp(char *source, char *dest, char *buf);
 
 class PTlinkProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/rageircd.c b/src/protocol/rageircd.c
index b9075b2cb..58e37f3e7 100644
--- a/src/protocol/rageircd.c
+++ b/src/protocol/rageircd.c
@@ -620,14 +620,14 @@ void rageircd_cmd_szline(char *mask, char *reason, char *whom)
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
 
-void rageircd_cmd_svsnoop(char *server, int set)
+void RageIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void rageircd_cmd_svsadmin(char *server, int set)
 {
-    rageircd_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void rageircd_cmd_sgline(char *mask, char *reason)
@@ -1562,7 +1562,6 @@ void rageircd_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(rageircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(rageircd_cmd_remove_akill);
     pmodule_cmd_topic(rageircd_cmd_topic);
     pmodule_cmd_vhost_off(rageircd_cmd_vhost_off);
diff --git a/src/protocol/rageircd.h b/src/protocol/rageircd.h
index 1e4b5d806..4dbd2e1c9 100644
--- a/src/protocol/rageircd.h
+++ b/src/protocol/rageircd.h
@@ -114,4 +114,5 @@ void rageircd_cmd_ctcp(char *source, char *dest, char *buf);
 
 class RageIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 9fc22d3bb..ec1ed357a 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -793,14 +793,8 @@ void ratbox_cmd_szline(char *mask, char *reason, char *whom)
     /* Does not support */
 }
 
-void ratbox_cmd_svsnoop(char *server, int set)
-{
-    /* does not support */
-}
-
 void ratbox_cmd_svsadmin(char *server, int set)
 {
-    ratbox_cmd_svsnoop(server, set);
 }
 
 void ratbox_cmd_sgline(char *mask, char *reason)
@@ -1768,7 +1762,6 @@ void ratbox_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(ratbox_cmd_svsnoop);
     pmodule_cmd_remove_akill(ratbox_cmd_remove_akill);
     pmodule_cmd_topic(ratbox_cmd_topic);
     pmodule_cmd_vhost_off(ratbox_cmd_vhost_off);
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 848870771..350a9e690 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -833,14 +833,8 @@ void shadowircd_cmd_szline(char *mask, char *reason, char *whom)
     /* Does not support */
 }
 
-void shadowircd_cmd_svsnoop(char *server, int set)
-{
-    /* does not support */
-}
-
 void shadowircd_cmd_svsadmin(char *server, int set)
 {
-    shadowircd_cmd_svsnoop(server, set);
 }
 
 void shadowircd_cmd_sgline(char *mask, char *reason)
@@ -1719,7 +1713,6 @@ void shadowircd_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(shadowircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(shadowircd_cmd_remove_akill);
     pmodule_cmd_topic(shadowircd_cmd_topic);
     pmodule_cmd_vhost_off(shadowircd_cmd_vhost_off);
diff --git a/src/protocol/solidircd.c b/src/protocol/solidircd.c
index e278b9f96..a82ec44f2 100644
--- a/src/protocol/solidircd.c
+++ b/src/protocol/solidircd.c
@@ -755,14 +755,14 @@ void solidircd_cmd_szline(char *mask, char *reason, char *whom)
 }
 
 /* SVSNOOP */
-void solidircd_cmd_svsnoop(char *server, int set)
+void SolidIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void solidircd_cmd_svsadmin(char *server, int set)
 {
-    solidircd_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 /* SGLINE */
@@ -1595,7 +1595,6 @@ void solidircd_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(solidircd_cmd_svsnoop);
     pmodule_cmd_remove_akill(solidircd_cmd_remove_akill);
     pmodule_cmd_topic(solidircd_cmd_topic);
     pmodule_cmd_vhost_off(solidircd_cmd_vhost_off);
diff --git a/src/protocol/solidircd.h b/src/protocol/solidircd.h
index 78e4b9ec7..b6930ba28 100644
--- a/src/protocol/solidircd.h
+++ b/src/protocol/solidircd.h
@@ -138,4 +138,5 @@ void solidircd_cmd_ctcp(char *source, char *dest, char *buf);
 
 class SolidIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/ultimate2.c b/src/protocol/ultimate2.c
index 1ac7207cd..e9593addd 100644
--- a/src/protocol/ultimate2.c
+++ b/src/protocol/ultimate2.c
@@ -782,14 +782,14 @@ void ultimate2_cmd_sqline(char *mask, char *reason)
     send_cmd(NULL, "SQLINE %s :%s", mask, reason);
 }
 
-void ultimate2_cmd_svsnoop(char *server, int set)
+void UltimateIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void ultimate2_cmd_svsadmin(char *server, int set)
 {
-    ultimate2_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void ultimate2_cmd_remove_akill(char *user, char *host)
@@ -1620,7 +1620,6 @@ void ultimate2_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(ultimate2_cmd_svsnoop);
     pmodule_cmd_remove_akill(ultimate2_cmd_remove_akill);
     pmodule_cmd_topic(ultimate2_cmd_topic);
     pmodule_cmd_vhost_off(ultimate2_cmd_vhost_off);
diff --git a/src/protocol/ultimate2.h b/src/protocol/ultimate2.h
index 40251ba6d..a80e699e7 100644
--- a/src/protocol/ultimate2.h
+++ b/src/protocol/ultimate2.h
@@ -119,4 +119,5 @@ void ultimate2_cmd_ctcp(char *source, char *dest, char *buf);
 
 class UltimateIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index 398a973e9..41e4e3a07 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -695,14 +695,14 @@ void ultimate3_cmd_szline(char *mask, char *reason, char *whom)
     /* send_cmd(NULL, "SZLINE %s :%s", mask, reason); */
 }
 
-void ultimate3_cmd_svsnoop(char *server, int set)
+void UltimateIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void ultimate3_cmd_svsadmin(char *server, int set)
 {
-    ultimate3_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void ultimate3_cmd_sgline(char *mask, char *reason)
@@ -1703,7 +1703,6 @@ void ultimate3_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(ultimate3_cmd_svsnoop);
     pmodule_cmd_remove_akill(ultimate3_cmd_remove_akill);
     pmodule_cmd_topic(ultimate3_cmd_topic);
     pmodule_cmd_vhost_off(ultimate3_cmd_vhost_off);
diff --git a/src/protocol/ultimate3.h b/src/protocol/ultimate3.h
index de53c83c6..638598094 100644
--- a/src/protocol/ultimate3.h
+++ b/src/protocol/ultimate3.h
@@ -124,4 +124,5 @@ void ultimate3_cmd_ctcp(char *source, char *dest, char *buf);
 
 class UltimateIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/unreal31.c b/src/protocol/unreal31.c
index 77fcab38a..0c44a3e8b 100644
--- a/src/protocol/unreal31.c
+++ b/src/protocol/unreal31.c
@@ -491,14 +491,14 @@ int anope_event_capab(char *source, int ac, char **av)
     return MOD_CONT;
 }
 
-void unreal_cmd_svsnoop(char *server, int set)
+void UnrealIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void unreal_cmd_svsadmin(char *server, int set)
 {
-    unreal_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void unreal_cmd_remove_akill(char *user, char *host)
@@ -1478,7 +1478,6 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(unreal_cmd_svsnoop);
     pmodule_cmd_remove_akill(unreal_cmd_remove_akill);
     pmodule_cmd_topic(unreal_cmd_topic);
     pmodule_cmd_vhost_off(unreal_cmd_vhost_off);
diff --git a/src/protocol/unreal31.h b/src/protocol/unreal31.h
index 50797980f..a335bdf74 100644
--- a/src/protocol/unreal31.h
+++ b/src/protocol/unreal31.h
@@ -124,4 +124,5 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf);
 
 class UnrealIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 80378acc5..b075306a4 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -502,15 +502,14 @@ int anope_event_capab(char *source, int ac, char **av)
 }
 
 /* SVSNOOP */
-void unreal_cmd_svsnoop(char *server, int set)
+void UnrealIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "%s %s %s", send_token("SVSNOOP", "f"), server,
-             (set ? "+" : "-"));
+	send_cmd(NULL, "%s %s %s", send_token("SVSNOOP", "f"), server, set ? "+" : "-");
 }
 
 void unreal_cmd_svsadmin(char *server, int set)
 {
-    unreal_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void unreal_cmd_remove_akill(char *user, char *host)
@@ -2118,7 +2117,6 @@ void moduleAddIRCDMsgs(void) {
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(unreal_cmd_svsnoop);
     pmodule_cmd_remove_akill(unreal_cmd_remove_akill);
     pmodule_cmd_topic(unreal_cmd_topic);
     pmodule_cmd_vhost_off(unreal_cmd_vhost_off);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 2eb0f9b4a..6e1e9c6a8 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -153,4 +153,5 @@ void unreal_cmd_ctcp(char *source, char *dest, char *buf);
 
 class UnrealIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;
diff --git a/src/protocol/viagra.c b/src/protocol/viagra.c
index 2615c57b8..d2889510e 100644
--- a/src/protocol/viagra.c
+++ b/src/protocol/viagra.c
@@ -766,14 +766,14 @@ void viagra_cmd_szline(char *mask, char *reason, char *whom)
     send_cmd(NULL, "SZLINE %s :%s", mask, reason);
 }
 
-void viagra_cmd_svsnoop(char *server, int set)
+void ViagraIRCdProto::cmd_svsnoop(const char *server, int set)
 {
-    send_cmd(NULL, "SVSNOOP %s %s", server, (set ? "+" : "-"));
+	send_cmd(NULL, "SVSNOOP %s %s", server, set ? "+" : "-");
 }
 
 void viagra_cmd_svsadmin(char *server, int set)
 {
-    viagra_cmd_svsnoop(server, set);
+	ircd_proto.cmd_svsnoop(server, set);
 }
 
 void viagra_cmd_sgline(char *mask, char *reason)
@@ -1602,7 +1602,6 @@ void viagra_cmd_ctcp(char *source, char *dest, char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_svsnoop(viagra_cmd_svsnoop);
     pmodule_cmd_remove_akill(viagra_cmd_remove_akill);
     pmodule_cmd_topic(viagra_cmd_topic);
     pmodule_cmd_vhost_off(viagra_cmd_vhost_off);
diff --git a/src/protocol/viagra.h b/src/protocol/viagra.h
index 75b499d05..5ef4a5cb2 100644
--- a/src/protocol/viagra.h
+++ b/src/protocol/viagra.h
@@ -133,4 +133,5 @@ void viagra_cmd_ctcp(char *source, char *dest, char *buf);
 
 class ViagraIRCdProto : public IRCDProtoNew {
 	public:
+		void cmd_svsnoop(const char *, int);
 } ircd_proto;