move opening of log before opening of config so that failure to open the config can...

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index ae02a2e6dbf5af6444cec17242450b5a53231f91..4eb439895f581d8ef8c5c7241b6239ea5fc6b7be 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -11,29 +11,30 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_nick(Instance);
 }
 
+/** Handle nick changes from users.
+ * NOTE: If you are used to ircds based on ircd2.8, and are looking
+ * for the client introduction code in here, youre in the wrong place.
+ * You need to look in the spanningtree module for this!
+ */
 CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
 
-       if (!*parameters[0])
-               return CMD_FAILURE;
-
-       if (!*user->nick)
+       if (!*parameters[0] || !*user->nick)
+       {
+               /* We cant put blanks in the parameters, so for this (extremely rare) issue we just put '*' here. */
+               user->WriteServ("432 %s * :Erroneous Nickname", *user->nick ? user->nick : "*");
                return CMD_FAILURE;
+       }
 
        if (irc::string(user->nick) == irc::string(parameters[0]))
        {
@@ -66,44 +67,51 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0], mq->reason);
                        return CMD_FAILURE;
                }
-               if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user) && (ServerInstance->IsNick(parameters[0])))
+               /* Check for nickname overruled -
+                * This happens when one user has connected and sent only NICK, and is essentially
+                * "camping" upon a nickname. To give the new user connecting a fair chance of having
+                * the nickname too, we force a nickchange on the older user (Simply the one who was
+                * here first, no TS checks need to take place here)
+                */
+               userrec* InUse = ServerInstance->FindNickOnly(parameters[0]);
+               if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
                {
-                       userrec* InUse = ServerInstance->FindNick(parameters[0]);
-                       /* XXX FIXME: This no longer works with the global culllist stuff,
-                        * because the user is pushed onto the cullList then we accept a new user
-                        * with the SAME nickname, so this mucks up the nickname hash completely.
-                        * We need to find a way to force a nickchange upon the user whos being
-                        * overruled, rather than quitting them. -- Brain
-                        *
                        if (InUse->registered != REG_ALL)
                        {
-                               userrec::QuitUser(ServerInstance, InUse, "Nickname overruled");
+                               /* change the nick of the older user to its UUID
+                                */
+                               InUse->WriteTo(InUse, "NICK %s", InUse->uuid);
+                               InUse->WriteServ("433 %s %s :Nickname overruled.", InUse->nick, InUse->nick);
+                               InUse->UpdateNickHash(InUse->uuid);
+                               strlcpy(InUse->nick, InUse->uuid, NICKMAX - 1);
+                               InUse->InvalidateCache();
+                               /* Take away their nickname-sent state forcing them to send a nick again */
+                               InUse->registered &= ~REG_NICK;
                        }
-                       else*/
+                       else
                        {
                                user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
                                return CMD_FAILURE;
                        }
                }
        }
-       if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
+       if (((!ServerInstance->IsNick(parameters[0]))) && (IS_LOCAL(user)))
        {
-               user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
-               return CMD_FAILURE;
-       }
-
-       if (user->registered == REG_ALL)
-       {
-               int MOD_RESULT = 0;
-               FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
-               if (MOD_RESULT) {
-                       // if a module returns true, the nick change is silently forbidden.
+               if (!allowinvalid)
+               {
+                       user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
                        return CMD_FAILURE;
                }
+       }
 
-               user->WriteCommon("NICK %s",parameters[0]);
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
+       if (MOD_RESULT)
+               // if a module returns true, the nick change is silently forbidden.
+               return CMD_FAILURE;
 
-       }
+       if (user->registered == REG_ALL)
+               user->WriteCommon("NICK %s",parameters[0]);
 
        strlcpy(oldnick, user->nick, NICKMAX - 1);
 
@@ -111,13 +119,24 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        user = user->UpdateNickHash(parameters[0]);
 
        /* actually change the nick within the record */
-       if (!user) return CMD_FAILURE;
-       if (!*user->nick) return CMD_FAILURE;
+       if (!user)
+               return CMD_FAILURE;
+       if (!*user->nick)
+               return CMD_FAILURE;
 
        strlcpy(user->nick, parameters[0], NICKMAX - 1);
 
        user->InvalidateCache();
 
+       /* Update display nicks */
+       for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+       {
+               CUList* ulist = v->first->GetUsers();
+               CUList::iterator i = ulist->find(user);
+               if (i != ulist->end())
+                       i->second = user->nick;
+       }
+
        if (user->registered < REG_NICKUSER)
        {
                user->registered = (user->registered | REG_NICK);
@@ -145,8 +164,10 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
        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);
+               int MOD_RESULT = 0;
+               FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+               if (MOD_RESULT > 0)
+                       return CMD_FAILURE;
        }
        if (user->registered == REG_ALL)
        {
@@ -157,3 +178,9 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 }
 
+CmdResult cmd_nick::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
+{
+       allowinvalid = (id != 0);
+       return CMD_SUCCESS;
+}
+