X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=cdb37690ef3d18b847bee788798060912b666a94;hb=922d4ebf7a27a6577d6b4f91e0f42ccdfa989455;hp=f977deddd73f582d2b17c9a42e35df43e8ff585f;hpb=194365ecfb90e1790e8fba6b96f49ec30daa7d81;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index f977deddd..cdb37690e 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,7 +23,6 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
@@ -103,7 +102,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			return;
 		}
 	}
-	if ((isnick(parameters[0]) == 0) && (IS_lOCAL(user)))
+	if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
 	{
 		WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
 		return;
@@ -125,7 +124,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 	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;
@@ -149,20 +148,9 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 		else
 		{
-#ifdef THREADED_DNS
-			// initialize their dns lookup thread
-			pthread_attr_t attribs;
-			pthread_attr_init(&attribs);
-			pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED);
-			if (pthread_create(&user->dnsthread, &attribs, dns_task, (void *)user) != 0)
-			{
-				log(DEBUG,"Failed to create DNS lookup thread for user %s: %s",user->nick, strerror(errno));
-			}
-#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 == REG_NICKUSER)