Added cmd_chg_nick() function to IRCDProtoNew class.

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

13 files changed, 10 insertions, 66 deletions

diff --git a/include/extern.h b/include/extern.h
index 316882e72..ccf71c8d2 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_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));
 E void pmodule_cmd_connect(void (*func) (int servernum));
diff --git a/include/services.h b/include/services.h
index 9c835c349..2c8f9465a 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_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);
     void (*ircd_cmd_connect)(int servernum);
@@ -1350,6 +1349,11 @@ class IRCDProtoNew {
 			send_cmd(NULL, "SQUIT %s :%s", servname, message);
 		}
 		virtual void cmd_svso(const char *, const char *, const char *) { }
+		virtual void cmd_chg_nick(const char *oldnick, const char *newnick)
+		{
+			if (!oldnick || !newnick) return;
+			send_cmd(oldnick, "NICK %s", newnick);
+		}
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index a65a99031..dc7ce142d 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_chg_nick = NULL;
     ircdproto.ircd_cmd_svsnick = NULL;
     ircdproto.ircd_cmd_vhost_on = NULL;
     ircdproto.ircd_cmd_connect = NULL;
@@ -481,7 +480,7 @@ void anope_cmd_svso(const char *source, const char *nick, const char *flag)
 
 void anope_cmd_chg_nick(const char *oldnick, const char *newnick)
 {
-    ircdproto.ircd_cmd_chg_nick(oldnick, newnick);
+	ircdprotonew->cmd_chg_nick(oldnick, newnick);
 }
 
 void anope_cmd_svsnick(const char *source, const char *guest, time_t when)
@@ -709,11 +708,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_chg_nick(void (*func) (const char *oldnick, const char *newnick))
-{
-    ircdproto.ircd_cmd_chg_nick = func;
-}
-
 void
 pmodule_cmd_svsnick(void (*func) (const char *source, const char *guest, time_t when))
 {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 95dda5622..1122e7af5 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1240,16 +1240,6 @@ void bahamut_cmd_svid_umode3(User * u, const char *ts)
     }
 }
 
-/* NICK <newnick>  */
-void bahamut_cmd_chg_nick(const char *oldnick, const char *newnick)
-{
-    if (!oldnick || !newnick) {
-        return;
-    }
-
-    send_cmd(oldnick, "NICK %s", newnick);
-}
-
 int anope_event_error(const char *source, int ac, const char **av)
 {
     if (ac >= 1) {
@@ -1432,7 +1422,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_chg_nick(bahamut_cmd_chg_nick);
     pmodule_cmd_svsnick(bahamut_cmd_svsnick);
     pmodule_cmd_vhost_on(bahamut_cmd_vhost_on);
     pmodule_cmd_connect(bahamut_cmd_connect);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index b9a4e8ee6..e4be4452e 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_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);
 void bahamut_cmd_connect(int servernum);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 8b60d6594..5a90c8f79 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1485,16 +1485,6 @@ void charybdis_cmd_svid_umode3(User * u, const char *ts)
     /* not used */
 }
 
-/* NICK <newnick>  */
-void charybdis_cmd_chg_nick(const char *oldnick, const char *newnick)
-{
-    if (!oldnick || !newnick) {
-        return;
-    }
-
-    send_cmd(oldnick, "NICK %s", newnick);
-}
-
 /*
  * SVINFO
  *      parv[0] = sender prefix
@@ -1697,7 +1687,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_chg_nick(charybdis_cmd_chg_nick);
     pmodule_cmd_svsnick(charybdis_cmd_svsnick);
     pmodule_cmd_vhost_on(charybdis_cmd_vhost_on);
     pmodule_cmd_connect(charybdis_cmd_connect);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 1946990a6..689f188cd 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_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);
 void charybdis_cmd_connect(int servernum);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 81a1d69e0..ad8d87f85 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -975,16 +975,6 @@ void InspIRCdProto::cmd_squit(const char *servname, const char *message)
 	send_cmd(ServerName, "SQUIT %s :%s", servname, message);
 }
 
-/* NICK <newnick>  */
-void inspircd_cmd_chg_nick(const char *oldnick, const char *newnick)
-{
-    if (!oldnick || !newnick) {
-        return;
-    }
-
-    send_cmd(oldnick, "NICK %s", newnick);
-}
-
 /* SVSNICK */
 void inspircd_cmd_svsnick(const char *source, const char *guest, time_t when)
 {
@@ -1683,7 +1673,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_chg_nick(inspircd_cmd_chg_nick);
     pmodule_cmd_svsnick(inspircd_cmd_svsnick);
     pmodule_cmd_vhost_on(inspircd_cmd_vhost_on);
     pmodule_cmd_connect(inspircd_cmd_connect);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 922e24fc9..afb2ff428 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_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);
 void inspircd_cmd_connect(int servernum);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 50ac8e85b..eeef40e21 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1406,16 +1406,6 @@ void ratbox_cmd_svid_umode3(User * u, const char *ts)
     /* not used */
 }
 
-/* NICK <newnick>  */
-void ratbox_cmd_chg_nick(const char *oldnick, const char *newnick)
-{
-    if (!oldnick || !newnick) {
-        return;
-    }
-
-    send_cmd(oldnick, "NICK %s", newnick);
-}
-
 /*
  * SVINFO
  *      parv[0] = sender prefix
@@ -1590,7 +1580,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_chg_nick(ratbox_cmd_chg_nick);
     pmodule_cmd_svsnick(ratbox_cmd_svsnick);
     pmodule_cmd_vhost_on(ratbox_cmd_vhost_on);
     pmodule_cmd_connect(ratbox_cmd_connect);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index a97164de9..9b9c8d5b3 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_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);
 void ratbox_cmd_connect(int servernum);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 2b1c9ed3e..a00e9059d 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -884,14 +884,10 @@ void UnrealIRCdProto::cmd_svso(const char *source, const char *nick, const char
 }
 
 /* NICK <newnick>  */
-void unreal_cmd_chg_nick(const char *oldnick, const char *newnick)
+void UnrealIRCdProto::cmd_chg_nick(const char *oldnick, const char *newnick)
 {
-    if (!oldnick || !newnick) {
-        return;
-    }
-
-    send_cmd(oldnick, "%s %s %ld", send_token("NICK", "&"), newnick,
-             (long int) time(NULL));
+	if (!oldnick || !newnick) return;
+	send_cmd(oldnick, "%s %s %ld", send_token("NICK", "&"), newnick, static_cast<long>(time(NULL)));
 }
 
 /* SVSNICK */
@@ -1976,7 +1972,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_chg_nick(unreal_cmd_chg_nick);
     pmodule_cmd_svsnick(unreal_cmd_svsnick);
     pmodule_cmd_vhost_on(unreal_cmd_vhost_on);
     pmodule_cmd_connect(unreal_cmd_connect);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index e7d750cea..a2e0a0090 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_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);
 void unreal_cmd_connect(int servernum);
@@ -140,4 +139,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_unsqline(const char *);
 		void cmd_sqline(const char *, const char *);
 		void cmd_svso(const char *, const char *, const char *);
+		void cmd_chg_nick(const char *, const char *);
 } ircd_proto;