Move to entirely using insp_sockaddr and insp_inaddr for socket stuff, first step...

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 3f608536210d6ff4fafa7ef077f1d40f339a8b59..ab286bee4b2ca925341e91d8f1ee2a33fcc89d17 100644 (file)
--- 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];
 
@@ -107,7 +79,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));
@@ -131,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]));
@@ -162,37 +134,45 @@ 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
+               {
+#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));
        }
 }
-