Added cmd_squit() function to IRCDProtoNew class.

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

13 files changed, 15 insertions, 72 deletions

diff --git a/include/extern.h b/include/extern.h
index ac221fee0..f5aadd689 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_squit(void (*func) (const char *servname, const char *message));
 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));
diff --git a/include/services.h b/include/services.h
index aca4b7f67..f545e6e37 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_squit)(const char *servname, const char *message);
     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);
@@ -1346,6 +1345,11 @@ class IRCDProtoNew {
 			send_cmd(source ? source : ServerName, "GLOBOPS :%s", buf);
 		}
 		virtual void cmd_sqline(const char *, const char *) = 0;
+		virtual void cmd_squit(const char *servname, const char *message)
+		{
+			if (!servname || !message) return;
+			send_cmd(NULL, "SQUIT %s :%s", servname, message);
+		}
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index ccb4504c0..a6c689e14 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_squit = NULL;
     ircdproto.ircd_cmd_svso = NULL;
     ircdproto.ircd_cmd_chg_nick = NULL;
     ircdproto.ircd_cmd_svsnick = NULL;
@@ -473,7 +472,7 @@ void anope_cmd_sqline(const char *mask, const char *reason)
 
 void anope_cmd_squit(const char *servname, const char *message)
 {
-    ircdproto.ircd_cmd_squit(servname, message);
+	ircdprotonew->cmd_squit(servname, message);
 }
 
 void anope_cmd_svso(const char *source, const char *nick, const char *flag)
@@ -711,11 +710,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_squit(void (*func) (const char *servname, const char *message))
-{
-    ircdproto.ircd_cmd_squit = func;
-}
-
 void pmodule_cmd_svso(void (*func) (const char *source, const char *nick, const char *flag))
 {
     ircdproto.ircd_cmd_svso = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 49874f730..bd3184c23 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -807,17 +807,6 @@ void BahamutIRCdProto::cmd_svsmode(User *u, int ac, const char **av)
 	send_cmd(ServerName, "SVSMODE %s %ld %s", u->nick, static_cast<long>(u->timestamp), merge_args(ac, av));
 }
 
-/* SQUIT */
-/*
- *        parv[0] = sender prefix
- *        parv[1] = server name
- *        parv[2] = comment
-*/
-void bahamut_cmd_squit(const char *servname, const char *message)
-{
-    send_cmd(NULL, "SQUIT %s :%s", servname, message);
-}
-
 /*
  * SVINFO
  *       parv[0] = sender prefix
@@ -1378,7 +1367,7 @@ void bahamut_cmd_jupe(const char *jserver, const char *who, const char *reason)
              reason ? ": " : "", reason ? reason : "");
 
     if (findserver(servlist, jserver))
-        bahamut_cmd_squit(jserver, rbuf);
+        ircd_proto.cmd_squit(jserver, rbuf);
     bahamut_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
@@ -1448,7 +1437,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_squit(bahamut_cmd_squit);
     pmodule_cmd_svso(bahamut_cmd_svso);
     pmodule_cmd_chg_nick(bahamut_cmd_chg_nick);
     pmodule_cmd_svsnick(bahamut_cmd_svsnick);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index ea48e9c93..9002037ee 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_squit(const char *servname, const char *message);
 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);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index d18e24a77..e5bee142e 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1348,16 +1348,6 @@ void CharybdisProto::cmd_invite(const char *source, const char *chan, const char
 	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "INVITE %s %s", UseTS6 ? (u ? u->uid : nick) : nick, chan);
 }
 
-/* SQUIT */
-void charybdis_cmd_squit(const char *servname, const char *message)
-{
-    if (!servname || !message) {
-        return;
-    }
-
-    send_cmd(NULL, "SQUIT %s :%s", servname, message);
-}
-
 int anope_event_mode(const char *source, int ac, const char **av)
 {
     User *u, *u2;
@@ -1629,7 +1619,7 @@ void charybdis_cmd_jupe(const char *jserver, const char *who, const char *reason
              reason ? ": " : "", reason ? reason : "");
 
     if (findserver(servlist, jserver))
-        charybdis_cmd_squit(jserver, rbuf);
+        ircd_proto.cmd_squit(jserver, rbuf);
     charybdis_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
@@ -1712,7 +1702,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_squit(charybdis_cmd_squit);
     pmodule_cmd_svso(charybdis_cmd_svso);
     pmodule_cmd_chg_nick(charybdis_cmd_chg_nick);
     pmodule_cmd_svsnick(charybdis_cmd_svsnick);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 2f3fd8668..2d5b391d2 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_squit(const char *servname, const char *message);
 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);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index bc1c88386..058ff82da 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -969,13 +969,10 @@ void InspIRCdProto::cmd_sqline(const char *mask, const char *reason)
 }
 
 /* SQUIT */
-void inspircd_cmd_squit(const char *servname, const char *message)
+void InspIRCdProto::cmd_squit(const char *servname, const char *message)
 {
-    if (!servname || !message) {
-        return;
-    }
-
-    send_cmd(ServerName, "SQUIT %s :%s", servname, message);
+	if (!servname || !message) return;
+	send_cmd(ServerName, "SQUIT %s :%s", servname, message);
 }
 
 /* SVSO */
@@ -1637,7 +1634,7 @@ void inspircd_cmd_jupe(const char *jserver, const char *who, const char *reason)
              reason ? ": " : "", reason ? reason : "");
 
     if (findserver(servlist, jserver))
-        inspircd_cmd_squit(jserver, rbuf);
+        ircd_proto.cmd_squit(jserver, rbuf);
     inspircd_cmd_server(jserver, 1, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
@@ -1691,7 +1688,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_squit(inspircd_cmd_squit);
     pmodule_cmd_svso(inspircd_cmd_svso);
     pmodule_cmd_chg_nick(inspircd_cmd_chg_nick);
     pmodule_cmd_svsnick(inspircd_cmd_svsnick);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 0736a3ab5..a6a47ef13 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_squit(const char *servname, const char *message);
 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);
@@ -122,4 +121,5 @@ class InspIRCdProto : 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_squit(const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 3f798330a..62a50da56 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1278,16 +1278,6 @@ void RatboxProto::cmd_invite(const char *source, const char *chan, const char *n
 	send_cmd(UseTS6 ? (ud ? ud->uid : source) : source, "INVITE %s %s", UseTS6 ? (u ? u->uid : nick) : nick, chan);
 }
 
-/* SQUIT */
-void ratbox_cmd_squit(const char *servname, const char *message)
-{
-    if (!servname || !message) {
-        return;
-    }
-
-    send_cmd(NULL, "SQUIT %s :%s", servname, message);
-}
-
 int anope_event_mode(const char *source, int ac, const char **av)
 {
     User *u, *u2;
@@ -1539,7 +1529,7 @@ void ratbox_cmd_jupe(const char *jserver, const char *who, const char *reason)
              reason ? ": " : "", reason ? reason : "");
 
     if (findserver(servlist, jserver))
-        ratbox_cmd_squit(jserver, rbuf);
+        ircd_proto.cmd_squit(jserver, rbuf);
     ratbox_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
@@ -1605,7 +1595,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_squit(ratbox_cmd_squit);
     pmodule_cmd_svso(ratbox_cmd_svso);
     pmodule_cmd_chg_nick(ratbox_cmd_chg_nick);
     pmodule_cmd_svsnick(ratbox_cmd_svsnick);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index b0b543e52..84eb67b66 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_squit(const char *servname, const char *message);
 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);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 50744ae57..9480dcba5 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -871,17 +871,6 @@ void UnrealIRCdProto::cmd_sqline(const char *mask, const char *reason)
 	send_cmd(NULL, "%s %s :%s", send_token("SQLINE", "c"), mask, reason);
 }
 
-/* SQUIT */
-void unreal_cmd_squit(const char *servname, const char *message)
-{
-    if (!servname || !message) {
-        return;
-    }
-
-    send_cmd(NULL, "%s %s :%s", send_token("SQUIT", "-"), servname,
-             message);
-}
-
 /*
 ** svso
 **      parv[0] = sender prefix
@@ -1669,7 +1658,7 @@ void unreal_cmd_jupe(const char *jserver, const char *who, const char *reason)
              reason ? ": " : "", reason ? reason : "");
 
     if (findserver(servlist, jserver))
-        unreal_cmd_squit(jserver, rbuf);
+        ircd_proto.cmd_squit(jserver, rbuf);
     unreal_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }
@@ -1990,7 +1979,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_squit(unreal_cmd_squit);
     pmodule_cmd_svso(unreal_cmd_svso);
     pmodule_cmd_chg_nick(unreal_cmd_chg_nick);
     pmodule_cmd_svsnick(unreal_cmd_svsnick);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index de4f2f843..fbe83acb4 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_squit(const char *servname, const char *message);
 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);