X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=ab286bee4b2ca925341e91d8f1ee2a33fcc89d17;hb=c80508b28be5947648f59710e6653f793a73bd76;hp=d36713029c192a00a95a47b3f466896360880e5e;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index d36713029..ab286bee4 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -14,56 +14,28 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
 #include <vector>
-#include <deque>
+#include "inspircd_config.h"
+#include "configreader.h"
+#include "hash_map.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
 #include "commands.h"
-#include "mode.h"
 #include "xline.h"
-#include "inspstring.h"
 #include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_nick.h"
+#include "commands/cmd_nick.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
-void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	char oldnick[NICKMAX];
 
@@ -102,25 +74,22 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 		 * the nick AAA is the same as the nick aaa.
 		 */
 		log(DEBUG,"old nick is new nick, not updating hash (case change only)");
-		strlcpy(oldnick,user->nick,NICKMAX);
+		strlcpy(oldnick, user->nick, NICKMAX - 1);
 		int MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
 		if (MOD_RESULT)
 			return;
-		strlcpy(user->nick,parameters[0],NICKMAX);
-		if (user->registered == 7)
+		if (user->registered == REG_ALL)
 			WriteCommon(user,"NICK %s",parameters[0]);
+		strlcpy(user->nick, parameters[0], NICKMAX - 1);
 		FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
 		return;
 	}
 	else
 	{
-		if (strlen(parameters[0]) > 1)
+		if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0))
 		{
-			if (parameters[0][0] == ':')
-			{
-				*parameters[0]++;
-			}
+			parameters[0]++;
 		}
 		if (matches_qline(parameters[0]))
 		{
@@ -134,13 +103,13 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 			return;
 		}
 	}
-	if (isnick(parameters[0]) == 0)
+	if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
 	{
 		WriteServ(user->fd,"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]));
@@ -153,7 +122,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 		
 	}
 
-	strlcpy(oldnick,user->nick,NICKMAX);
+	strlcpy(oldnick, user->nick, NICKMAX - 1);
 
 	/* change the nick of the user in the users_hash */
 	user = ReHashNick(user->nick, parameters[0]);
@@ -161,41 +130,49 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
 	if (!user) return;
 	if (!user->nick) return;
 
-	strlcpy(user->nick, parameters[0],NICKMAX);
+	strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
 	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);
 
-#ifdef THREADED_DNS
-		// initialize their dns lookup thread
-		if (pthread_create(&user->dnsthread, NULL, dns_task, (void *)user) != 0)
+		if (Config->NoUserDns)
 		{
-			log(DEBUG,"Failed to create DNS lookup thread for user %s",user->nick);
+			user->dns_done = true;
 		}
+		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));
-		if (user->dns_done)
-			log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
+			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);
 #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));
 	}
 }
-