userrec::UpdateNickHash(), userrec::ForceNickChange(), userrec::FullConnect()

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 16b3d2b94e79e777fa0b1703d4f61f5945831767..cdb37690ef3d18b847bee788798060912b666a94 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,11 +23,10 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "cmd_nick.h"
+#include "commands/cmd_nick.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
@@ -35,7 +34,7 @@ extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 
-void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
 
@@ -79,7 +78,7 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user)
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT)
                        return;
-               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));
@@ -103,13 +102,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]));
@@ -125,7 +124,7 @@ void cmd_nick::Handle (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;
@@ -134,35 +133,33 @@ void cmd_nick::Handle (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);
 
-#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
+               {
+                       user->StartDNSLookup();
+                       if (user->dns_done)
+                               log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
                }
-#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);
-#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));
        }