Added cmd_guest_nick() function to IRCDProtoClass.

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

13 files changed, 12 insertions, 48 deletions

diff --git a/include/extern.h b/include/extern.h
index 7c965b177..8a5c3c948 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -613,7 +613,6 @@ E void pmodule_cmd_372(void (*func) (const char *source, const char *msg));
 E void pmodule_cmd_372_error(void (*func) (const char *source));
 E void pmodule_cmd_375(void (*func) (const char *source));
 E void pmodule_cmd_376(void (*func) (const char *source));
-E void pmodule_cmd_guest_nick(void (*func) (const char *nick, const char *user, const char *host, const char *real, const char *modes));
 E void pmodule_cmd_mode(void (*func) (const char *source, const char *dest, const char *buf));
 E void pmodule_cmd_bot_nick(void (*func) (const char *nick, const char *user, const char *host, const char *real, const char *modes));
 E void pmodule_cmd_kick(void (*func) (const char *source, const char *chan, const char *user, const char *buf));
diff --git a/include/services.h b/include/services.h
index 71529c402..1faa0e2c6 100644
--- a/include/services.h
+++ b/include/services.h
@@ -1079,7 +1079,6 @@ typedef struct ircd_proto_ {
     void (*ircd_cmd_372_error)(const char *source);
     void (*ircd_cmd_375)(const char *source);
     void (*ircd_cmd_376)(const char *source);
-    void (*ircd_cmd_guest_nick)(const char *nick, const char *user, const char *host, const char *real, const char *modes);
     void (*ircd_cmd_mode)(const char *source, const char *dest, const char *buf);
     void (*ircd_cmd_bot_nick)(const char *nick, const char *user, const char *host, const char *real, const char *modes);
     void (*ircd_cmd_kick)(const char *source, const char *chan, const char *user, const char *buf);
@@ -1151,6 +1150,7 @@ class IRCDProtoNew {
 		virtual void cmd_svskill(const char *source, const char *user, const char *buf) = 0;
 		virtual void cmd_svsmode(User *u, int ac, const char **av) = 0;
 		virtual void cmd_nick(const char *, const char *, const char *) = 0;
+		virtual void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *) { }
 };
 
 typedef struct ircd_modes_ {
diff --git a/src/ircd.c b/src/ircd.c
index 58184667b..25336fb5d 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -50,7 +50,6 @@ void initIrcdProto()
     ircdproto.ircd_cmd_372_error = NULL;
     ircdproto.ircd_cmd_375 = NULL;
     ircdproto.ircd_cmd_376 = NULL;
-    ircdproto.ircd_cmd_guest_nick = NULL;
     ircdproto.ircd_cmd_mode = NULL;
     ircdproto.ircd_cmd_bot_nick = NULL;
     ircdproto.ircd_cmd_kick = NULL;
@@ -196,7 +195,7 @@ void anope_cmd_nick(const char *nick, const char *name, const char *modes)
 
 void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
-    ircdproto.ircd_cmd_guest_nick(nick, user, host, real, modes);
+	ircdprotonew->cmd_guest_nick(nick, user, host, real, modes);
 }
 
 void anope_cmd_mode(const char *source, const char *dest, const char *fmt, ...)
@@ -701,13 +700,6 @@ void pmodule_cmd_376(void (*func) (const char *source))
     ircdproto.ircd_cmd_376 = func;
 }
 
-void pmodule_cmd_guest_nick(void (*func)
-                             (const char *nick, const char *user, const char *host,
-                              const char *real, const char *modes))
-{
-    ircdproto.ircd_cmd_guest_nick = func;
-}
-
 void pmodule_cmd_mode(void (*func) (const char *source, const char *dest, const char *buf))
 {
     ircdproto.ircd_cmd_mode = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index d482c4628..7e41af3db 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1316,11 +1316,9 @@ void bahamut_cmd_svsnick(const char *source, const char *guest, time_t when)
     send_cmd(NULL, "SVSNICK %s %s :%ld", source, guest, (long int) when);
 }
 
-void bahamut_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
-                            const char *modes)
+void BahamutIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
-    send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
-             (long int) time(NULL), modes, user, host, ServerName, real);
+	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_svso(const char *source, const char *nick, const char *flag)
@@ -1544,7 +1542,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_372_error(bahamut_cmd_372_error);
     pmodule_cmd_375(bahamut_cmd_375);
     pmodule_cmd_376(bahamut_cmd_376);
-    pmodule_cmd_guest_nick(bahamut_cmd_guest_nick);
     pmodule_cmd_mode(bahamut_cmd_mode);
     pmodule_cmd_bot_nick(bahamut_cmd_bot_nick);
     pmodule_cmd_kick(bahamut_cmd_kick);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index f9a52018d..d3758eca8 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -63,7 +63,6 @@ void bahamut_cmd_372(const char *source, const char *msg);
 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_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void bahamut_cmd_mode(const char *source, const char *dest, const char *buf);
 void bahamut_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void bahamut_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
@@ -128,4 +127,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_svskill(const char *source, const char *user, const char *buf);
 		void cmd_svsmode(User *u, int ac, const char **av);
 		void cmd_nick(const char *, const char *, const char *);
+		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index a47720e7a..a6a885c09 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1561,12 +1561,6 @@ void charybdis_cmd_svsnick(const char *nick, const char *newnick, time_t when)
              u->nick, newnick, (long int)when, (long int)u->timestamp);
 }
 
-void charybdis_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
-                           const char *modes)
-{
-    /* not supported  */
-}
-
 void charybdis_cmd_svso(const char *source, const char *nick, const char *flag)
 {
     /* Not Supported by this IRCD */
@@ -1808,7 +1802,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_372_error(charybdis_cmd_372_error);
     pmodule_cmd_375(charybdis_cmd_375);
     pmodule_cmd_376(charybdis_cmd_376);
-    pmodule_cmd_guest_nick(charybdis_cmd_guest_nick);
     pmodule_cmd_mode(charybdis_cmd_mode);
     pmodule_cmd_bot_nick(charybdis_cmd_bot_nick);
     pmodule_cmd_kick(charybdis_cmd_kick);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 76cb1b287..b8d196f00 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -51,7 +51,6 @@ void charybdis_cmd_372(const char *source, const char *msg);
 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_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void charybdis_cmd_mode(const char *source, const char *dest, const char *buf);
 void charybdis_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void charybdis_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 27aafbed7..ea49c1ee4 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -610,12 +610,9 @@ void InspIRCdProto::cmd_nick(const char *nick, const char *name, const char *mod
 	send_cmd(nick, "OPERTYPE Service");
 }
 
-void
-inspircd_cmd_guest_nick(const char *nick, const char *user, const char *host,
-                        const char *real, const char *modes)
+void InspIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
-    send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",
-             (long int) time(NULL), nick, host, host, user, modes, real);
+	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, host, host, user, modes, real);
 }
 
 void inspircd_cmd_mode(const char *source, const char *dest, const char *buf)
@@ -1788,7 +1785,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_372_error(inspircd_cmd_372_error);
     pmodule_cmd_375(inspircd_cmd_375);
     pmodule_cmd_376(inspircd_cmd_376);
-    pmodule_cmd_guest_nick(inspircd_cmd_guest_nick);
     pmodule_cmd_mode(inspircd_cmd_mode);
     pmodule_cmd_bot_nick(inspircd_cmd_bot_nick);
     pmodule_cmd_kick(inspircd_cmd_kick);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 9b808e680..914bf10f0 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -56,7 +56,6 @@ void inspircd_cmd_372(const char *source, const char *msg);
 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_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void inspircd_cmd_mode(const char *source, const char *dest, const char *buf);
 void inspircd_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void inspircd_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_svskill(const char *source, const char *user, const char *buf);
 		void cmd_svsmode(User *u, int ac, const char **av);
 		void cmd_nick(const char *, const char *, const char *);
+		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index cc67c6522..5d2983518 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1481,12 +1481,6 @@ void ratbox_cmd_svsnick(const char *nick, const char *newnick, time_t when)
     /* not supported */
 }
 
-void ratbox_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
-                           const char *modes)
-{
-    /* not supported  */
-}
-
 void ratbox_cmd_svso(const char *source, const char *nick, const char *flag)
 {
     /* Not Supported by this IRCD */
@@ -1700,7 +1694,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_372_error(ratbox_cmd_372_error);
     pmodule_cmd_375(ratbox_cmd_375);
     pmodule_cmd_376(ratbox_cmd_376);
-    pmodule_cmd_guest_nick(ratbox_cmd_guest_nick);
     pmodule_cmd_mode(ratbox_cmd_mode);
     pmodule_cmd_bot_nick(ratbox_cmd_bot_nick);
     pmodule_cmd_kick(ratbox_cmd_kick);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index a8866d7b8..82d7ed6d7 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -50,7 +50,6 @@ void ratbox_cmd_372(const char *source, const char *msg);
 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_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void ratbox_cmd_mode(const char *source, const char *dest, const char *buf);
 void ratbox_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void ratbox_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 226aa3bf4..cf92b6530 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -596,13 +596,10 @@ void UnrealIRCdProto::cmd_nick(const char *nick, const char *name, const char *m
 	unreal_cmd_sqline(nick, "Reserved for services");
 }
 
-void unreal_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
-                           const char *modes)
+void UnrealIRCdProto::cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
 {
-    send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s",
-             send_token("NICK", "&"), nick, (long int) time(NULL), user,
-             host, ServerName, modes, host, (myIrcd->nickip ? " *" : " "),
-             real);
+	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), user, host, ServerName, modes, host,
+		myIrcd->nickip ? " *" : " ", real);
 }
 
 void unreal_cmd_mode(const char *source, const char *dest, const char *buf)
@@ -2089,7 +2086,6 @@ void moduleAddAnopeCmds()
     pmodule_cmd_372_error(unreal_cmd_372_error);
     pmodule_cmd_375(unreal_cmd_375);
     pmodule_cmd_376(unreal_cmd_376);
-    pmodule_cmd_guest_nick(unreal_cmd_guest_nick);
     pmodule_cmd_mode(unreal_cmd_mode);
     pmodule_cmd_bot_nick(unreal_cmd_bot_nick);
     pmodule_cmd_kick(unreal_cmd_kick);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 248a71ad2..857fdeee6 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -85,7 +85,6 @@ void unreal_cmd_372(const char *source, const char *msg);
 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_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void unreal_cmd_mode(const char *source, const char *dest, const char *buf);
 void unreal_cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes);
 void unreal_cmd_kick(const char *source, const char *chan, const char *user, const char *buf);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_svskill(const char *source, const char *user, const char *buf);
 		void cmd_svsmode(User *u, int ac, const char **av);
 		void cmd_nick(const char *, const char *, const char *);
+		void cmd_guest_nick(const char *, const char *, const char *, const char *, const char *);
 } ircd_proto;