Added cmd_nick() function to IRCDProtoNew class.

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

13 files changed, 37 insertions, 65 deletions

diff --git a/include/extern.h b/include/extern.h
index 66760eddc..7c965b177 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_nick(void (*func) (const char *nick, const char *name, const char *modes));
 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));
diff --git a/include/services.h b/include/services.h
index ac36c6947..71529c402 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_nick)(const char *nick, const char *name, const char *modes);
     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);
@@ -1151,6 +1150,7 @@ class IRCDProtoNew {
 		virtual void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *) = 0;
 		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;
 };
 
 typedef struct ircd_modes_ {
diff --git a/src/ircd.c b/src/ircd.c
index f26795f3d..58184667b 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_nick = NULL;
     ircdproto.ircd_cmd_guest_nick = NULL;
     ircdproto.ircd_cmd_mode = NULL;
     ircdproto.ircd_cmd_bot_nick = NULL;
@@ -192,7 +191,7 @@ void anope_cmd_376(const char *source)
 
 void anope_cmd_nick(const char *nick, const char *name, const char *modes)
 {
-    ircdproto.ircd_cmd_nick(nick, name, modes);
+	ircdprotonew->cmd_nick(nick, name, modes);
 }
 
 void anope_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
@@ -702,11 +701,6 @@ void pmodule_cmd_376(void (*func) (const char *source))
     ircdproto.ircd_cmd_376 = func;
 }
 
-void pmodule_cmd_nick(void (*func) (const char *nick, const char *name, const char *modes))
-{
-    ircdproto.ircd_cmd_nick = func;
-}
-
 void pmodule_cmd_guest_nick(void (*func)
                              (const char *nick, const char *user, const char *host,
                               const char *real, const char *modes))
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 0443f8250..d482c4628 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1210,13 +1210,11 @@ void bahamut_cmd_211(const char *buf)
     send_cmd(NULL, "211 %s", buf);
 }
 
-void bahamut_cmd_nick(const char *nick, const char *name, const char *modes)
+void BahamutIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
 {
-    EnforceQlinedNick(nick, NULL);
-    send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick,
-             (long int) time(NULL), modes, ServiceUser, ServiceHost,
-             ServerName, name);
-    bahamut_cmd_sqline(nick, "Reserved for services");
+	EnforceQlinedNick(nick, NULL);
+	send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s 0 0 :%s", nick, static_cast<long>(time(NULL)), modes, ServiceUser, ServiceHost, ServerName, name);
+	bahamut_cmd_sqline(nick, "Reserved for services");
 }
 
 void bahamut_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1546,7 +1544,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_nick(bahamut_cmd_nick);
     pmodule_cmd_guest_nick(bahamut_cmd_guest_nick);
     pmodule_cmd_mode(bahamut_cmd_mode);
     pmodule_cmd_bot_nick(bahamut_cmd_bot_nick);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 8a03d8642..f9a52018d 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_nick(const char *nick, const char *name, const char *modes);
 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);
@@ -128,4 +127,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		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 *);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 0dfcce2e2..a47720e7a 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1354,21 +1354,16 @@ void charybdis_cmd_tmode(const char *source, const char *dest, const char *fmt,
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void charybdis_cmd_nick(const char *nick, const char *name, const char *mode)
+void CharybdisProto::cmd_nick(const char *nick, const char *name, const char *mode)
 {
-    EnforceQlinedNick(nick, NULL);
-    if (UseTS6) {
-        char *uidbuf = ts6_uid_retrieve();
-        send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick,
-                 (long int) time(NULL), mode, ServiceUser, ServiceHost,
-                 uidbuf, name);
-        new_uid(nick, uidbuf);
-    } else {
-        send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
-                 (long int) time(NULL), mode, ServiceUser, ServiceHost,
-                 ServerName, name);
-    }
-    charybdis_cmd_sqline(nick, "Reserved for services");
+	EnforceQlinedNick(nick, NULL);
+	if (UseTS6) {
+		char *uidbuf = ts6_uid_retrieve();
+		send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
+		new_uid(nick, uidbuf);
+	}
+	else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
+	charybdis_cmd_sqline(nick, "Reserved for services");
 }
 
 void charybdis_cmd_kick(const char *source, const char *chan, const char *user, const char *buf)
@@ -1813,7 +1808,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_nick(charybdis_cmd_nick);
     pmodule_cmd_guest_nick(charybdis_cmd_guest_nick);
     pmodule_cmd_mode(charybdis_cmd_mode);
     pmodule_cmd_bot_nick(charybdis_cmd_bot_nick);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 601bf4003..76cb1b287 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_nick(const char *nick, const char *name, const char *modes);
 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);
@@ -116,4 +115,5 @@ class CharybdisProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		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 *);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 383605282..27aafbed7 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -602,14 +602,12 @@ void inspircd_cmd_376(const char *source)
     send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
 
-void inspircd_cmd_nick(const char *nick, const char *name, const char *modes)
+void InspIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
 {
-    /* :test.chatspike.net NICK 1133519355 Brain synapse.brainbox.winbot.co.uk netadmin.chatspike.net ~brain +xwsioS 10.0.0.2 :Craig Edwards */
-    send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s",
-             (long int) time(NULL), nick, ServiceHost, ServiceHost,
-             ServiceUser, modes, name);
-    /* Don't send ServerName as the source here... -GD */
-    send_cmd(nick, "OPERTYPE Service");
+	/* :test.chatspike.net NICK 1133519355 Brain synapse.brainbox.winbot.co.uk netadmin.chatspike.net ~brain +xwsioS 10.0.0.2 :Craig Edwards */
+	send_cmd(ServerName, "NICK %ld %s %s %s %s +%s 0.0.0.0 :%s", static_cast<long>(time(NULL)), nick, ServiceHost, ServiceHost, ServiceUser, modes, name);
+	/* Don't send ServerName as the source here... -GD */
+	send_cmd(nick, "OPERTYPE Service");
 }
 
 void
@@ -1790,7 +1788,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_nick(inspircd_cmd_nick);
     pmodule_cmd_guest_nick(inspircd_cmd_guest_nick);
     pmodule_cmd_mode(inspircd_cmd_mode);
     pmodule_cmd_bot_nick(inspircd_cmd_bot_nick);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 997507f54..9b808e680 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_nick(const char *nick, const char *name, const char *modes);
 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);
@@ -132,4 +131,5 @@ class InspIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		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 *);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 53fb8675d..cc67c6522 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1287,20 +1287,15 @@ void ratbox_cmd_tmode(const char *source, const char *dest, const char *fmt, ...
     send_cmd(NULL, "MODE %s %s", dest, buf);
 }
 
-void ratbox_cmd_nick(const char *nick, const char *name, const char *mode)
+void RatboxProto::cmd_nick(const char *nick, const char *name, const char *mode)
 {
-    EnforceQlinedNick(nick, NULL);
-    if (UseTS6) {
+	EnforceQlinedNick(nick, NULL);
+	if (UseTS6) {
 		char *uidbuf = ts6_uid_retrieve();
-        send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick,
-                 (long int) time(NULL), mode, ServiceUser, ServiceHost,
-                 uidbuf, name);
-        new_uid(nick, uidbuf);
-    } else {
-        send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick,
-                 (long int) time(NULL), mode, ServiceUser, ServiceHost,
-                 ServerName, name);
-    }
+		send_cmd(TS6SID, "UID %s 1 %ld %s %s %s 0 %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, uidbuf, name);
+		new_uid(nick, uidbuf);
+	}
+	else send_cmd(NULL, "NICK %s 1 %ld %s %s %s %s :%s", nick, static_cast<long>(time(NULL)), mode, ServiceUser, ServiceHost, ServerName, name);
 	ratbox_cmd_sqline(nick, "Reserved for services");
 }
 
@@ -1705,7 +1700,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_nick(ratbox_cmd_nick);
     pmodule_cmd_guest_nick(ratbox_cmd_guest_nick);
     pmodule_cmd_mode(ratbox_cmd_mode);
     pmodule_cmd_bot_nick(ratbox_cmd_bot_nick);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index bbcb2b6c6..a8866d7b8 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_nick(const char *nick, const char *name, const char *modes);
 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);
@@ -114,4 +113,5 @@ class RatboxProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		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 *);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 10c4e8738..226aa3bf4 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -588,14 +588,12 @@ void unreal_cmd_376(const char *source)
     send_cmd(ServerName, "376 %s :End of /MOTD command.", source);
 }
 
-void unreal_cmd_nick(const char *nick, const char *name, const char *modes)
+void UnrealIRCdProto::cmd_nick(const char *nick, const char *name, const char *modes)
 {
-    EnforceQlinedNick(nick, NULL);
-    send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s",
-             send_token("NICK", "&"), nick, (long int) time(NULL),
-             ServiceUser, ServiceHost, ServerName, modes, ServiceHost,
-             (myIrcd->nickip ? " *" : " "), name);
-    unreal_cmd_sqline(nick, "Reserved for services");
+	EnforceQlinedNick(nick, NULL);
+	send_cmd(NULL, "%s %s 1 %ld %s %s %s 0 %s %s%s :%s", send_token("NICK", "&"), nick, static_cast<long>(time(NULL)), ServiceUser, ServiceHost, ServerName, modes,
+		ServiceHost, myIrcd->nickip ? " *" : " ", name);
+	unreal_cmd_sqline(nick, "Reserved for services");
 }
 
 void unreal_cmd_guest_nick(const char *nick, const char *user, const char *host, const char *real,
@@ -2091,7 +2089,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_nick(unreal_cmd_nick);
     pmodule_cmd_guest_nick(unreal_cmd_guest_nick);
     pmodule_cmd_mode(unreal_cmd_mode);
     pmodule_cmd_bot_nick(unreal_cmd_bot_nick);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 4d849d55f..248a71ad2 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_nick(const char *nick, const char *name, const char *modes);
 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);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 		void cmd_akill(const char *, const char *, const char *, time_t, time_t, const char *);
 		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 *);
 } ircd_proto;