Added cmd_vhost_on() function to IRCDProtoNew class.

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

11 files changed, 15 insertions, 48 deletions

diff --git a/src/ircd.c b/src/ircd.c
index 81aabdcc1..be4adc8c4 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_vhost_on = NULL;
     ircdproto.ircd_cmd_connect = NULL;
     ircdproto.ircd_cmd_svshold = NULL;
     ircdproto.ircd_cmd_release_svshold = NULL;
@@ -489,7 +488,7 @@ void anope_cmd_svsnick(const char *source, const char *guest, time_t when)
 
 void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
-    ircdproto.ircd_cmd_vhost_on(nick, vIdent, vhost);
+	ircdprotonew->cmd_vhost_on(nick, vIdent, vhost);
 }
 
 void anope_cmd_connect(int servernum)
@@ -707,12 +706,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
     ircdproto.ircd_cmd_211 = func;
 }
 
-void
-pmodule_cmd_vhost_on(void (*func) (const char *nick, const char *vIdent, const char *vhost))
-{
-    ircdproto.ircd_cmd_vhost_on = func;
-}
-
 void pmodule_cmd_connect(void (*func) (int servernum))
 {
     ircdproto.ircd_cmd_connect = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index dd3e2c130..d72935bf8 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1189,11 +1189,6 @@ void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const
 	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);
 }
 
-void bahamut_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
-{
-    /* Not Supported by this IRCD */
-}
-
 /* SVSMODE +d */
 /* sent if svid is something weird */
 void bahamut_cmd_svid_umode(const char *nick, time_t ts)
@@ -1408,7 +1403,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(bahamut_cmd_242);
     pmodule_cmd_243(bahamut_cmd_243);
     pmodule_cmd_211(bahamut_cmd_211);
-    pmodule_cmd_vhost_on(bahamut_cmd_vhost_on);
     pmodule_cmd_connect(bahamut_cmd_connect);
     pmodule_cmd_svshold(bahamut_cmd_svshold);
     pmodule_cmd_release_svshold(bahamut_cmd_release_svshold);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 703cd4914..d3240b779 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_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void bahamut_cmd_connect(int servernum);
 void bahamut_cmd_svshold(const char *nick);
 void bahamut_cmd_release_svshold(const char *nick);
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 00e5049aa..1f56cad85 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -796,15 +796,14 @@ void CharybdisProto::cmd_topic(const char *whosets, const char *chan, const char
 	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void charybdis_cmd_vhost_off(User * u)
+void CharybdisProto::cmd_vhost_off(User *u)
 {
 	send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", u->nick, u->host);
 }
 
-void charybdis_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
+void CharybdisProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
-    send_cmd((UseTS6 ? TS6SID : ServerName), "ENCAP * CHGHOST %s :%s",
-             nick, vhost);
+	send_cmd(UseTS6 ? TS6SID : ServerName, "ENCAP * CHGHOST %s :%s", nick, vhost);
 }
 
 void CharybdisProto::cmd_unsqline(const char *user)
@@ -1680,7 +1679,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(charybdis_cmd_242);
     pmodule_cmd_243(charybdis_cmd_243);
     pmodule_cmd_211(charybdis_cmd_211);
-    pmodule_cmd_vhost_on(charybdis_cmd_vhost_on);
     pmodule_cmd_connect(charybdis_cmd_connect);
     pmodule_cmd_svshold(charybdis_cmd_svshold);
     pmodule_cmd_release_svshold(charybdis_cmd_release_svshold);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index b6efaea06..2d1c98ad9 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_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void charybdis_cmd_connect(int servernum);
 void charybdis_cmd_svshold(const char *nick);
 void charybdis_cmd_release_svshold(const char *nick);
@@ -110,4 +109,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_global(const char *, const char *);
 		void cmd_sqline(const char *, const char *);
 		void cmd_svsnick(const char *, const char *, time_t);
+		void cmd_vhost_on(const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index aef6983d1..c2a7cea58 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -977,15 +977,11 @@ void InspIRCdProto::cmd_squit(const char *servname, const char *message)
 
 /* Functions that use serval cmd functions */
 
-void inspircd_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
+void InspIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
-    if (!nick) {
-        return;
-    }
-    if (vIdent) {
-        inspircd_cmd_chgident(nick, vIdent);
-    }
-    inspircd_cmd_chghost(nick, vhost);
+	if (!nick) return;
+	if (vIdent) inspircd_cmd_chgident(nick, vIdent);
+	inspircd_cmd_chghost(nick, vhost);
 }
 
 void inspircd_cmd_connect(int servernum)
@@ -1662,7 +1658,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(inspircd_cmd_242);
     pmodule_cmd_243(inspircd_cmd_243);
     pmodule_cmd_211(inspircd_cmd_211);
-    pmodule_cmd_vhost_on(inspircd_cmd_vhost_on);
     pmodule_cmd_connect(inspircd_cmd_connect);
     pmodule_cmd_svshold(inspircd_cmd_svshold);
     pmodule_cmd_release_svshold(inspircd_cmd_release_svshold);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 15fed6a08..186ac1b79 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_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void inspircd_cmd_connect(int servernum);
 void inspircd_cmd_svshold(const char *nick);
 void inspircd_cmd_release_svshold(const char *nick);
@@ -119,4 +118,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_unsqline(const char *);
 		void cmd_sqline(const char *, const char *);
 		void cmd_squit(const char *, const char *);
+		void cmd_vhost_on(const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 111aa69b2..30f57d173 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -743,11 +743,6 @@ void RatboxProto::cmd_topic(const char *whosets, const char *chan, const char *w
 	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
 }
 
-void ratbox_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
-{
-    /* not supported  */
-}
-
 void RatboxProto::cmd_unsqline(const char *user)
 {
 	Uid *ud = find_uid(s_OperServ);
@@ -1574,7 +1569,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(ratbox_cmd_242);
     pmodule_cmd_243(ratbox_cmd_243);
     pmodule_cmd_211(ratbox_cmd_211);
-    pmodule_cmd_vhost_on(ratbox_cmd_vhost_on);
     pmodule_cmd_connect(ratbox_cmd_connect);
     pmodule_cmd_svshold(ratbox_cmd_svshold);
     pmodule_cmd_release_svshold(ratbox_cmd_release_svshold);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index 67a92cec3..e17cc7b4c 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_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void ratbox_cmd_connect(int servernum);
 void ratbox_cmd_svshold(const char *nick);
 void ratbox_cmd_release_svshold(const char *nick);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index c06a09f4a..9ec7c83e8 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -892,15 +892,11 @@ void UnrealIRCdProto::cmd_chg_nick(const char *oldnick, const char *newnick)
 
 /* Functions that use serval cmd functions */
 
-void unreal_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
+void UnrealIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
 {
-    if (!nick) {
-        return;
-    }
-    if (vIdent) {
-        unreal_cmd_chgident(nick, vIdent);
-    }
-    unreal_cmd_chghost(nick, vhost);
+	if (!nick) return;
+	if (vIdent) unreal_cmd_chgident(nick, vIdent);
+	unreal_cmd_chghost(nick, vhost);
 }
 
 void unreal_cmd_connect(int servernum)
@@ -1956,7 +1952,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_242(unreal_cmd_242);
     pmodule_cmd_243(unreal_cmd_243);
     pmodule_cmd_211(unreal_cmd_211);
-    pmodule_cmd_vhost_on(unreal_cmd_vhost_on);
     pmodule_cmd_connect(unreal_cmd_connect);
     pmodule_cmd_svshold(unreal_cmd_svshold);
     pmodule_cmd_release_svshold(unreal_cmd_release_svshold);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 75cd02e58..c59dd3a05 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_vhost_on(const char *nick, const char *vIdent, const char *vhost);
 void unreal_cmd_connect(int servernum);
 void unreal_cmd_svshold(const char *nick);
 void unreal_cmd_release_svshold(const char *nick);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_sqline(const char *, const char *);
 		void cmd_svso(const char *, const char *, const char *);
 		void cmd_chg_nick(const char *, const char *);
+		void cmd_vhost_on(const char *, const char *, const char *);
 } ircd_proto;