Added cmd_svsnick() function to IRCDProtoNew class.

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

11 files changed, 8 insertions, 77 deletions

diff --git a/src/ircd.c b/src/ircd.c
index dc7ce142d..81aabdcc1 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_svsnick = NULL;
     ircdproto.ircd_cmd_vhost_on = NULL;
     ircdproto.ircd_cmd_connect = NULL;
     ircdproto.ircd_cmd_svshold = NULL;
@@ -485,7 +484,7 @@ void anope_cmd_chg_nick(const char *oldnick, const char *newnick)
 
 void anope_cmd_svsnick(const char *source, const char *guest, time_t when)
 {
-    ircdproto.ircd_cmd_svsnick(source, guest, when);
+	ircdprotonew->cmd_svsnick(source, guest, when);
 }
 
 void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
@@ -709,12 +708,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
 }
 
 void
-pmodule_cmd_svsnick(void (*func) (const char *source, const char *guest, time_t when))
-{
-    ircdproto.ircd_cmd_svsnick = func;
-}
-
-void
 pmodule_cmd_vhost_on(void (*func) (const char *nick, const char *vIdent, const char *vhost))
 {
     ircdproto.ircd_cmd_vhost_on = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 1122e7af5..dd3e2c130 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1184,20 +1184,6 @@ void BahamutIRCdProto::cmd_bot_nick(const char *nick, const char *user, const ch
 	cmd_sqline(nick, "Reserved for services");
 }
 
-/* SVSNICK */
-/* parv[0] = sender
- * parv[1] = old nickname
- * parv[2] = new nickname
- * parv[3] = timestamp
- */
-void bahamut_cmd_svsnick(const char *source, const char *guest, time_t when)
-{
-    if (!source || !guest) {
-        return;
-    }
-    send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
-}
-
 void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
 	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);
@@ -1422,7 +1408,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_svsnick(bahamut_cmd_svsnick);
     pmodule_cmd_vhost_on(bahamut_cmd_vhost_on);
     pmodule_cmd_connect(bahamut_cmd_connect);
     pmodule_cmd_svshold(bahamut_cmd_svshold);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index e4be4452e..703cd4914 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_svsnick(const char *source, const char *guest, time_t when);
 void bahamut_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void bahamut_cmd_connect(int servernum);
 void bahamut_cmd_svshold(const char *nick);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 5a90c8f79..00e5049aa 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1433,19 +1433,12 @@ void charybdis_cmd_release_svshold(const char *nick)
 }
 
 /* SVSNICK */
-void charybdis_cmd_svsnick(const char *nick, const char *newnick, time_t when)
+void CharybdisProto::cmd_svsnick(const char *oldnick, const char *newnick, time_t when)
 {
-    User *u;
-
-    if (!nick || !newnick) {
-        return;
-    }
-
-    u = finduser(nick);
-    if (!u)
-        return;
-    send_cmd(NULL, "ENCAP %s RSFNC %s %s %ld %ld", u->server->name,
-             u->nick, newnick, (long int)when, (long int)u->timestamp);
+	if (!oldnick || !newnick) return;
+	User *u = finduser(oldnick);
+	if (!u) return;
+	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));
 }
 
 void charybdis_cmd_unban(const char *name, const char *nick)
@@ -1687,7 +1680,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_svsnick(charybdis_cmd_svsnick);
     pmodule_cmd_vhost_on(charybdis_cmd_vhost_on);
     pmodule_cmd_connect(charybdis_cmd_connect);
     pmodule_cmd_svshold(charybdis_cmd_svshold);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 689f188cd..b6efaea06 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_svsnick(const char *source, const char *guest, time_t when);
 void charybdis_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void charybdis_cmd_connect(int servernum);
 void charybdis_cmd_svshold(const char *nick);
@@ -110,4 +109,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_part(const char *, const char *, const char *);
 		void cmd_global(const char *, const char *);
 		void cmd_sqline(const char *, const char *);
+		void cmd_svsnick(const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index ad8d87f85..aef6983d1 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -975,17 +975,6 @@ void InspIRCdProto::cmd_squit(const char *servname, const char *message)
 	send_cmd(ServerName, "SQUIT %s :%s", servname, message);
 }
 
-/* SVSNICK */
-void inspircd_cmd_svsnick(const char *source, const char *guest, time_t when)
-{
-    if (!source || !guest) {
-        return;
-    }
-    /* Please note that inspircd will now echo back a nickchange for this SVSNICK */
-    send_cmd(ServerName, "SVSNICK %s %s :%lu", source, guest,
-             (unsigned long) when);
-}
-
 /* Functions that use serval cmd functions */
 
 void inspircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
@@ -1673,7 +1662,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_svsnick(inspircd_cmd_svsnick);
     pmodule_cmd_vhost_on(inspircd_cmd_vhost_on);
     pmodule_cmd_connect(inspircd_cmd_connect);
     pmodule_cmd_svshold(inspircd_cmd_svshold);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index afb2ff428..15fed6a08 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_svsnick(const char *source, const char *guest, time_t when);
 void inspircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void inspircd_cmd_connect(int servernum);
 void inspircd_cmd_svshold(const char *nick);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index eeef40e21..111aa69b2 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1363,12 +1363,6 @@ void ratbox_cmd_release_svshold(const char *nick)
     /* Not Supported by this IRCD */
 }
 
-/* SVSNICK */
-void ratbox_cmd_svsnick(const char *nick, const char *newnick, time_t when)
-{
-    /* not supported */
-}
-
 void ratbox_cmd_unban(const char *name, const char *nick)
 {
     /* Not Supported by this IRCD */
@@ -1580,7 +1574,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_svsnick(ratbox_cmd_svsnick);
     pmodule_cmd_vhost_on(ratbox_cmd_vhost_on);
     pmodule_cmd_connect(ratbox_cmd_connect);
     pmodule_cmd_svshold(ratbox_cmd_svshold);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 9b9c8d5b3..67a92cec3 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_svsnick(const char *source, const char *guest, time_t when);
 void ratbox_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void ratbox_cmd_connect(int servernum);
 void ratbox_cmd_svshold(const char *nick);
@@ -108,4 +107,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_part(const char *, const char *, const char *);
 		void cmd_global(const char *, const char *);
 		void cmd_sqline(const char *, const char *);
+		void cmd_svsnick(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index a00e9059d..c06a09f4a 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -890,22 +890,6 @@ void UnrealIRCdProto::cmd_chg_nick(const char *oldnick, const char *newnick)
 	send_cmd(oldnick, "%s %s %ld", send_token("NICK", "&"), newnick, static_cast<long>(time(NULL)));
 }
 
-/* SVSNICK */
-/*
-**      parv[0] = sender
-**      parv[1] = old nickname
-**      parv[2] = new nickname
-**      parv[3] = timestamp
-*/
-void unreal_cmd_svsnick(const char *source, const char *guest, time_t when)
-{
-    if (!source || !guest) {
-        return;
-    }
-    send_cmd(NULL, "%s %s %s :%ld", send_token("SVSNICK", "e"), source,
-             guest, (long int) when);
-}
-
 /* Functions that use serval cmd functions */
 
 void unreal_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
@@ -1972,7 +1956,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_svsnick(unreal_cmd_svsnick);
     pmodule_cmd_vhost_on(unreal_cmd_vhost_on);
     pmodule_cmd_connect(unreal_cmd_connect);
     pmodule_cmd_svshold(unreal_cmd_svshold);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index a2e0a0090..75cd02e58 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_svsnick(const char *source, const char *guest, time_t when);
 void unreal_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void unreal_cmd_connect(int servernum);
 void unreal_cmd_svshold(const char *nick);