Added cmd_eob() function to IRCDProtoNew class.

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

13 files changed, 11 insertions, 35 deletions

diff --git a/include/extern.h b/include/extern.h
index a8222add6..04971d70c 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_eob(void (*func) ());
 E void pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason));
 E void pmodule_set_umode(void (*func) (User * user, int ac, const char **av));
 E void pmodule_valid_nick(int (*func) (const char *nick));
diff --git a/include/services.h b/include/services.h
index fa43c3749..500547d0c 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_eob)();
     void (*ircd_cmd_jupe)(const char *jserver, const char *who, const char *reason);
     void (*ircd_set_umode)(User *user, int ac, const char **av);
     int (*ircd_valid_nick)(const char *nick);
@@ -1364,6 +1363,7 @@ class IRCDProtoNew {
 		virtual void cmd_svsjoin(const char *, const char *, const char *, const char *) { }
 		virtual void cmd_svspart(const char *, const char *, const char *) { }
 		virtual void cmd_swhois(const char *, const char *, const char *) { }
+		virtual void cmd_eob() { }
 };
 
 /*************************************************************************/
diff --git a/src/ircd.c b/src/ircd.c
index c00ff25ba..05fae4f13 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_eob = NULL;
     ircdproto.ircd_flood_mode_check = NULL;
     ircdproto.ircd_cmd_jupe = NULL;
     ircdproto.ircd_valid_nick = NULL;
@@ -556,7 +555,7 @@ void anope_cmd_swhois(const char *source, const char *who, const char *mask)
 
 void anope_cmd_eob()
 {
-    ircdproto.ircd_cmd_eob();
+	ircdprotonew->cmd_eob();
 }
 
 int anope_flood_mode_check(const char *value)
@@ -688,11 +687,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void pmodule_cmd_eob(void (*func) ())
-{
-    ircdproto.ircd_cmd_eob = func;
-}
-
 void
 pmodule_cmd_jupe(void (*func) (const char *jserver, const char *who, const char *reason))
 {
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index d2c41f555..16166996d 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1230,9 +1230,9 @@ int anope_event_pass(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void bahamut_cmd_eob()
+void BahamutIRCdProto::cmd_eob()
 {
-    send_cmd(NULL, "BURST 0");
+	send_cmd(NULL, "BURST 0");
 }
 
 int anope_event_burst(const char *source, int ac, const char **av)
@@ -1352,7 +1352,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_eob(bahamut_cmd_eob);
     pmodule_flood_mode_check(bahamut_flood_mode_check);
     pmodule_cmd_jupe(bahamut_cmd_jupe);
     pmodule_valid_nick(bahamut_valid_nick);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index c81293283..28d55209b 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_eob();
 int bahamut_flood_mode_check(const char *value);
 void bahamut_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int bahamut_valid_nick(const char *nick);
@@ -111,4 +110,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_svid_umode(const char *, time_t);
 		void cmd_nc_change(User *);
 		void cmd_svid_umode3(User *, const char *);
+		void cmd_eob();
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 55629527e..92c865f5e 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -966,11 +966,6 @@ int anope_event_kick(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void charybdis_cmd_eob()
-{
-    /* doesn't support EOB */
-}
-
 int anope_event_join(const char *source, int ac, const char **av)
 {
     if (ac != 1) {
@@ -1588,7 +1583,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_eob(charybdis_cmd_eob);
     pmodule_flood_mode_check(charybdis_flood_mode_check);
     pmodule_cmd_jupe(charybdis_cmd_jupe);
     pmodule_valid_nick(charybdis_valid_nick);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index e5330dfa9..60d461c57 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_eob();
 int charybdis_flood_mode_check(const char *value);
 void charybdis_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int charybdis_valid_nick(const char *nick);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 095b3cf18..f9531182e 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1502,9 +1502,9 @@ void InspIRCdProto::cmd_svspart(const char *source, const char *nick, const char
 	send_cmd(source, "SVSPART %s %s", nick, chan);
 }
 
-void inspircd_cmd_eob()
+void InspIRCdProto::cmd_eob()
 {
-    send_cmd(NULL, "ENDBURST");
+	send_cmd(NULL, "ENDBURST");
 }
 
 
@@ -1584,7 +1584,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_eob(inspircd_cmd_eob);
     pmodule_flood_mode_check(inspircd_flood_mode_check);
     pmodule_cmd_jupe(inspircd_cmd_jupe);
     pmodule_valid_nick(inspircd_valid_nick);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 01106b162..8b4a0520f 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_eob();
 int inspircd_flood_mode_check(const char *value);
 void inspircd_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int inspircd_valid_nick(const char *nick);
@@ -114,4 +113,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_svid_umode2(User *, const char *);
 		void cmd_svsjoin(const char *, const char *, const char *, const char *);
 		void cmd_svspart(const char *, const char *, const char *);
+		void cmd_eob();
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index a81b00a55..6c20237bc 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -895,11 +895,6 @@ int anope_event_kick(const char *source, int ac, const char **av)
     return MOD_CONT;
 }
 
-void ratbox_cmd_eob()
-{
-    /* doesn't support EOB */
-}
-
 int anope_event_join(const char *source, int ac, const char **av)
 {
     if (ac != 1) {
@@ -1465,7 +1460,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_eob(ratbox_cmd_eob);
     pmodule_flood_mode_check(ratbox_flood_mode_check);
     pmodule_cmd_jupe(ratbox_cmd_jupe);
     pmodule_valid_nick(ratbox_valid_nick);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 1c2385392..ee806e5e2 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_eob();
 int ratbox_flood_mode_check(const char *value);
 void ratbox_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int ratbox_valid_nick(const char *nick);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 8494c2c7b..e91894351 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1517,9 +1517,9 @@ void UnrealIRCdProto::cmd_swhois(const char *source, const char *who, const char
 	send_cmd(source, "%s %s :%s", send_token("SWHOIS", "BA"), who, mask);
 }
 
-void unreal_cmd_eob()
+void UnrealIRCdProto::cmd_eob()
 {
-    send_cmd(ServerName, "%s", send_token("EOS", "ES"));
+	send_cmd(ServerName, "%s", send_token("EOS", "ES"));
 }
 
 /* svswatch
@@ -1900,7 +1900,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_eob(unreal_cmd_eob);
     pmodule_flood_mode_check(unreal_flood_mode_check);
     pmodule_cmd_jupe(unreal_cmd_jupe);
     pmodule_valid_nick(unreal_valid_nick);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index a506688a7..7d557b7f7 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_eob();
 int unreal_flood_mode_check(const char *value);
 void unreal_cmd_jupe(const char *jserver, const char *who, const char *reason);
 int unreal_valid_nick(const char *nick);
@@ -140,4 +139,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_svsjoin(const char *, const char *, const char *, const char *);
 		void cmd_svspart(const char *, const char *, const char *);
 		void cmd_swhois(const char *, const char *, const char *);
+		void cmd_eob();
 } ircd_proto;