Added cmd_pong() function to IRCDProtoNew class.

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

11 files changed, 15 insertions, 53 deletions

diff --git a/src/ircd.c b/src/ircd.c
index 206f24544..d1682f029 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -51,7 +51,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_375 = NULL;
     ircdproto.ircd_cmd_376 = NULL;
     ircdproto.ircd_cmd_351 = NULL;
-    ircdproto.ircd_cmd_pong = NULL;
     ircdproto.ircd_cmd_join = NULL;
     ircdproto.ircd_cmd_unsqline = NULL;
     ircdproto.ircd_cmd_invite = NULL;
@@ -306,7 +305,7 @@ void anope_cmd_quit(const char *source, const char *fmt, ...)
 
 void anope_cmd_pong(const char *servname, const char *who)
 {
-    ircdproto.ircd_cmd_pong(servname, who);
+	ircdprotonew->cmd_pong(servname, who);
 }
 
 void anope_cmd_join(const char *user, const char *channel, time_t chantime)
@@ -661,11 +660,6 @@ void pmodule_cmd_351(void (*func) (const char *source))
     ircdproto.ircd_cmd_351 = func;
 }
 
-void pmodule_cmd_pong(void (*func) (const char *servname, const char *who))
-{
-    ircdproto.ircd_cmd_pong = func;
-}
-
 void
 pmodule_cmd_join(void (*func) (const char *user, const char *channel, time_t chantime))
 {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 1241e92a0..9da48a827 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -835,12 +835,6 @@ void bahamut_cmd_squit(const char *servname, const char *message)
     send_cmd(NULL, "SQUIT %s :%s", servname, message);
 }
 
-/* PONG */
-void bahamut_cmd_pong(const char *servname, const char *who)
-{
-    send_cmd(servname, "PONG %s", who);
-}
-
 /*
  * SVINFO
  *       parv[0] = sender prefix
@@ -1219,7 +1213,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
 {
     if (ac < 1)
         return MOD_CONT;
-    bahamut_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
+    ircd_proto.cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
     return MOD_CONT;
 }
 
@@ -1479,7 +1473,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(bahamut_cmd_375);
     pmodule_cmd_376(bahamut_cmd_376);
     pmodule_cmd_351(bahamut_cmd_351);
-    pmodule_cmd_pong(bahamut_cmd_pong);
     pmodule_cmd_join(bahamut_cmd_join);
     pmodule_cmd_unsqline(bahamut_cmd_unsqline);
     pmodule_cmd_invite(bahamut_cmd_invite);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index df40c4e3c..e6e7f8da6 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -64,7 +64,6 @@ void bahamut_cmd_372_error(const char *source);
 void bahamut_cmd_375(const char *source);
 void bahamut_cmd_376(const char *source);
 void bahamut_cmd_351(const char *source);
-void bahamut_cmd_pong(const char *servname, const char *who);
 void bahamut_cmd_join(const char *user, const char *channel, time_t chantime);
 void bahamut_cmd_unsqline(const char *user);
 void bahamut_cmd_invite(const char *source, const char *chan, const char *nick);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 658c47bd1..10c53bec4 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -973,7 +973,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
 {
     if (ac < 1)
         return MOD_CONT;
-    charybdis_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
+    ircd_proto.cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
     return MOD_CONT;
 }
 
@@ -1353,14 +1353,11 @@ void CharybdisProto::cmd_quit(const char *source, const char *buf)
 }
 
 /* PONG */
-void charybdis_cmd_pong(const char *servname, const char *who)
+void CharybdisProto::cmd_pong(const char *servname, const char *who)
 {
-    if (UseTS6) {
-        /* deliberately no SID in the first parameter -- jilles */
-        send_cmd(TS6SID, "PONG %s :%s", servname, who);
-    } else {
-        send_cmd(servname, "PONG %s :%s", servname, who);
-    }
+	/* deliberately no SID in the first parameter -- jilles */
+	if (UseTS6) send_cmd(TS6SID, "PONG %s :%s", servname, who);
+	else send_cmd(servname, "PONG %s :%s", servname, who);
 }
 
 /* INVITE */
@@ -1732,7 +1729,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(charybdis_cmd_375);
     pmodule_cmd_376(charybdis_cmd_376);
     pmodule_cmd_351(charybdis_cmd_351);
-    pmodule_cmd_pong(charybdis_cmd_pong);
     pmodule_cmd_join(charybdis_cmd_join);
     pmodule_cmd_unsqline(charybdis_cmd_unsqline);
     pmodule_cmd_invite(charybdis_cmd_invite);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index ec67a247c..480f93726 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -52,7 +52,6 @@ void charybdis_cmd_372_error(const char *source);
 void charybdis_cmd_375(const char *source);
 void charybdis_cmd_376(const char *source);
 void charybdis_cmd_351(const char *source);
-void charybdis_cmd_pong(const char *servname, const char *who);
 void charybdis_cmd_join(const char *user, const char *channel, time_t chantime);
 void charybdis_cmd_unsqline(const char *user);
 void charybdis_cmd_invite(const char *source, const char *chan, const char *nick);
@@ -113,4 +112,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_privmsg(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
+		void cmd_pong(const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 78b2a4649..b01d8febf 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -812,12 +812,6 @@ void inspircd_cmd_server(const char *servname, int hop, const char *descript)
              descript);
 }
 
-/* PONG */
-void inspircd_cmd_pong(const char *servname, const char *who)
-{
-    send_cmd(servname, "PONG %s", who);
-}
-
 /* JOIN */
 void inspircd_cmd_join(const char *user, const char *channel, time_t chantime)
 {
@@ -1091,7 +1085,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
     if (ac < 1)
         return MOD_CONT;
     /* ((ac > 1) ? av[1] : ServerName) */
-    inspircd_cmd_pong(ServerName, av[0]);
+    ircd_proto.cmd_pong(ServerName, av[0]);
     return MOD_CONT;
 }
 
@@ -1725,7 +1719,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(inspircd_cmd_375);
     pmodule_cmd_376(inspircd_cmd_376);
     pmodule_cmd_351(inspircd_cmd_351);
-    pmodule_cmd_pong(inspircd_cmd_pong);
     pmodule_cmd_join(inspircd_cmd_join);
     pmodule_cmd_unsqline(inspircd_cmd_unsqline);
     pmodule_cmd_invite(inspircd_cmd_invite);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 6ba7ad1c0..44677c97e 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -57,7 +57,6 @@ void inspircd_cmd_372_error(const char *source);
 void inspircd_cmd_375(const char *source);
 void inspircd_cmd_376(const char *source);
 void inspircd_cmd_351(const char *source);
-void inspircd_cmd_pong(const char *servname, const char *who);
 void inspircd_cmd_join(const char *user, const char *channel, time_t chantime);
 void inspircd_cmd_unsqline(const char *user);
 void inspircd_cmd_invite(const char *source, const char *chan, const char *nick);
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index ad882e924..911f1863a 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -913,7 +913,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
 {
     if (ac < 1)
         return MOD_CONT;
-    ratbox_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
+    ircd_proto.cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
     return MOD_CONT;
 }
 
@@ -1285,13 +1285,10 @@ void RatboxProto::cmd_quit(const char *source, const char *buf)
 }
 
 /* PONG */
-void ratbox_cmd_pong(const char *servname, const char *who)
+void RatboxProto::cmd_pong(const char *servname, const char *who)
 {
-    if (UseTS6) {
-        send_cmd(TS6SID, "PONG %s", who);
-    } else {
-        send_cmd(servname, "PONG %s", who);
-    }
+	if (UseTS6) send_cmd(TS6SID, "PONG %s", who);
+	else send_cmd(servname, "PONG %s", who);
 }
 
 /* INVITE */
@@ -1626,7 +1623,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(ratbox_cmd_375);
     pmodule_cmd_376(ratbox_cmd_376);
     pmodule_cmd_351(ratbox_cmd_351);
-    pmodule_cmd_pong(ratbox_cmd_pong);
     pmodule_cmd_join(ratbox_cmd_join);
     pmodule_cmd_unsqline(ratbox_cmd_unsqline);
     pmodule_cmd_invite(ratbox_cmd_invite);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 1beeafceb..568647ce2 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -51,7 +51,6 @@ void ratbox_cmd_372_error(const char *source);
 void ratbox_cmd_375(const char *source);
 void ratbox_cmd_376(const char *source);
 void ratbox_cmd_351(const char *source);
-void ratbox_cmd_pong(const char *servname, const char *who);
 void ratbox_cmd_join(const char *user, const char *channel, time_t chantime);
 void ratbox_cmd_unsqline(const char *user);
 void ratbox_cmd_invite(const char *source, const char *chan, const char *nick);
@@ -111,4 +110,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_privmsg(const char *, const char *, const char *);
 		void cmd_bot_chan_mode(const char *, const char *);
 		void cmd_quit(const char *, const char *);
+		void cmd_pong(const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 8684be95c..d1104d445 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -696,12 +696,6 @@ void unreal_cmd_server(const char *servname, int hop, const char *descript)
     }
 }
 
-/* PONG */
-void unreal_cmd_pong(const char *servname, const char *who)
-{
-    send_cmd(servname, "%s %s", send_token("PONG", "9"), who);
-}
-
 /* JOIN */
 void unreal_cmd_join(const char *user, const char *channel, time_t chantime)
 {
@@ -1014,7 +1008,7 @@ int anope_event_ping(const char *source, int ac, const char **av)
 {
     if (ac < 1)
         return MOD_CONT;
-    unreal_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
+    ircd_proto.cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
     return MOD_CONT;
 }
 
@@ -2026,7 +2020,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_375(unreal_cmd_375);
     pmodule_cmd_376(unreal_cmd_376);
     pmodule_cmd_351(unreal_cmd_351);
-    pmodule_cmd_pong(unreal_cmd_pong);
     pmodule_cmd_join(unreal_cmd_join);
     pmodule_cmd_unsqline(unreal_cmd_unsqline);
     pmodule_cmd_invite(unreal_cmd_invite);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index d4d99541b..905082ef3 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -86,7 +86,6 @@ void unreal_cmd_372_error(const char *source);
 void unreal_cmd_375(const char *source);
 void unreal_cmd_376(const char *source);
 void unreal_cmd_351(const char *source);
-void unreal_cmd_pong(const char *servname, const char *who);
 void unreal_cmd_join(const char *user, const char *channel, time_t chantime);
 void unreal_cmd_unsqline(const char *user);
 void unreal_cmd_invite(const char *source, const char *chan, const char *nick);