X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=a7472bd95d9710fd648db59f2200b0dc676d4d30;hb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;hp=bfaddda236ff97b5a634c92fb78c774c2da24c4d;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index bfaddda23..a7472bd95 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,18 +23,11 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "commands/cmd_nick.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
 void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char oldnick[NICKMAX];
@@ -79,8 +72,8 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT)
 			return;
-		if (user->registered == 7)
-			WriteCommon(user,"NICK %s",parameters[0]);
+		if (user->registered == REG_ALL)
+			user->WriteCommon("NICK %s",parameters[0]);
 		strlcpy(user->nick, parameters[0], NICKMAX - 1);
 		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 		return;
@@ -93,23 +86,23 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 		if (matches_qline(parameters[0]))
 		{
-			WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
-			WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
+			ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
+			user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
 			return;
 		}
-		if ((Find(parameters[0])) && (Find(parameters[0]) != user))
+		if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user))
 		{
-			WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+			user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
 			return;
 		}
 	}
-	if (isnick(parameters[0]) == 0)
+	if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
 	{
-		WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
+		user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
 		return;
 	}
 
-	if (user->registered == 7)
+	if (user->registered == REG_ALL)
 	{
 		int MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
@@ -118,14 +111,14 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			return;
 		}
 
-		WriteCommon(user,"NICK %s",parameters[0]);
+		user->WriteCommon("NICK %s",parameters[0]);
 		
 	}
 
 	strlcpy(oldnick, user->nick, NICKMAX - 1);
 
 	/* change the nick of the user in the users_hash */
-	user = ReHashNick(user->nick, parameters[0]);
+	user = user->UpdateNickHash(parameters[0]);
 	/* actually change the nick within the record */
 	if (!user) return;
 	if (!user->nick) return;
@@ -134,41 +127,33 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 	log(DEBUG,"new nick set: %s",user->nick);
 	
-	if (user->registered < 3)
+	if (user->registered < REG_NICKUSER)
 	{
-		user->registered = (user->registered | 2);
+		user->registered = (user->registered | REG_NICK);
 		// dont attempt to look up the dns until they pick a nick... because otherwise their pointer WILL change
 		// and unless we're lucky we'll get a duff one later on.
 		//user->dns_done = (!lookup_dns(user->nick));
 		//if (user->dns_done)
 		//	log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 
-		if (Config->NoUserDns)
+		if (ServerInstance->Config->NoUserDns)
 		{
 			user->dns_done = true;
 		}
 		else
 		{
-#ifdef THREADED_DNS
-			// initialize their dns lookup thread
-			if (pthread_create(&user->dnsthread, NULL, dns_task, (void *)user) != 0)
-			{
-				log(DEBUG,"Failed to create DNS lookup thread for user %s",user->nick);
-			}
-#else
-			user->dns_done = (!lookup_dns(user->nick));
+			user->StartDNSLookup();
 			if (user->dns_done)
 				log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
-#endif
 		}
 	}
-	if (user->registered == 3)
+	if (user->registered == REG_NICKUSER)
 	{
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
 		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
 		//ConnectUser(user,NULL);
 	}
-	if (user->registered == 7)
+	if (user->registered == REG_ALL)
 	{
 		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 	}