]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/cmd_nick.cpp
Tidy up strlens which are not required
[user/henk/code/inspircd.git] / src / cmd_nick.cpp
index f977deddd73f582d2b17c9a42e35df43e8ff585f..911c80bd8a966286444d842bd83a9b7bac220aeb 100644 (file)
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
+#include "inspircd.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)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_nick(Instance);
+}
+
+CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
 
-       if (pcnt < 1) 
-       {
-               log(DEBUG,"not enough params for handle_nick");
-               return;
-       }
-       if (!parameters[0])
-       {
-               log(DEBUG,"invalid parameter passed to handle_nick");
-               return;
-       }
        if (!parameters[0][0])
        {
-               log(DEBUG,"zero length new nick passed to handle_nick");
-               return;
+               ServerInstance->Log(DEBUG,"zero length new nick passed to handle_nick");
+               return CMD_FAILURE;
        }
-       if (!user)
+       if (!*user->nick)
        {
-               log(DEBUG,"invalid user passed to handle_nick");
-               return;
-       }
-       if (!user->nick)
-       {
-               log(DEBUG,"invalid old nick passed to handle_nick");
-               return;
+               ServerInstance->Log(DEBUG,"invalid old nick passed to handle_nick");
+               return CMD_FAILURE;
        }
+       ServerInstance->Log(DEBUG,"Fall through");
        if (irc::string(user->nick) == irc::string(parameters[0]))
        {
                /* If its exactly the same, even case, dont do anything. */
                if (!strcmp(user->nick,parameters[0]))
-                       return;
+                       return CMD_SUCCESS;
+
                /* Its a change of case. People insisted that they should be
                 * able to do silly things like this even though the RFC says
                 * the nick AAA is the same as the nick aaa.
                 */
-               log(DEBUG,"old nick is new nick, not updating hash (case change only)");
+               ServerInstance->Log(DEBUG,"old nick is new nick, not updating hash (case change only)");
                strlcpy(oldnick, user->nick, NICKMAX - 1);
                int MOD_RESULT = 0;
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT)
-                       return;
+                       return CMD_FAILURE;
                if (user->registered == REG_ALL)
-                       WriteCommon(user,"NICK %s",parameters[0]);
+                       user->WriteCommon("NICK %s",parameters[0]);
                strlcpy(user->nick, parameters[0], NICKMAX - 1);
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
-               return;
+               return CMD_SUCCESS;
        }
        else
        {
-               if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0))
+               QLine* mq = ServerInstance->XLines->matches_qline(parameters[0]);
+               if (mq)
                {
-                       parameters[0]++;
+                       ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0], user->nick, user->ident, user->host, mq->reason);
+                       user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0], mq->reason);
+                       return CMD_FAILURE;
                }
-               if (matches_qline(parameters[0]))
+               if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user) && (ServerInstance->IsNick(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]));
-                       return;
-               }
-               if ((Find(parameters[0])) && (Find(parameters[0]) != user))
-               {
-                       WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
-                       return;
+                       userrec* InUse = ServerInstance->FindNick(parameters[0]);
+                       if (InUse->registered != REG_ALL)
+                       {
+                               userrec::QuitUser(ServerInstance, InUse, "Nickname overruled");
+                       }
+                       else
+                       {
+                               user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+                               return CMD_FAILURE;
+                       }
                }
        }
-       if ((isnick(parameters[0]) == 0) && (IS_lOCAL(user)))
+       if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
        {
-               WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
-               return;
+               user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
+               return CMD_FAILURE;
        }
 
        if (user->registered == REG_ALL)
@@ -115,24 +100,24 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT) {
                        // if a module returns true, the nick change is silently forbidden.
-                       return;
+                       return CMD_FAILURE;
                }
 
-               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;
+       if (!user) return CMD_FAILURE;
+       if (!*user->nick) return CMD_FAILURE;
 
        strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
-       log(DEBUG,"new nick set: %s",user->nick);
+       ServerInstance->Log(DEBUG,"new nick set: %s",user->nick);
        
        if (user->registered < REG_NICKUSER)
        {
@@ -141,28 +126,17 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                // 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);
+               //      ServerInstance->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
-                       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
+                               ServerInstance->Log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
                }
        }
        if (user->registered == REG_NICKUSER)
@@ -175,4 +149,8 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        {
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
        }
+
+       return CMD_SUCCESS;
+
 }
+