Convert more modules

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 3d74e591a33275461b97d6961919f69110b7a1b3..4e2ebcf6e425de17bdc7797a0dac2c03475dd4b5 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -11,29 +11,33 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #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,13 +70,24 @@ 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->FindNick(parameters[0]);
+               if (InUse && (InUse != user) && (ServerInstance->IsNick(parameters[0])))
                {
-                       userrec* InUse = ServerInstance->FindNick(parameters[0]);
                        if (InUse->registered != REG_ALL)
                        {
                                /* change the nick of the older user to nnn-overruled,
                                 * where nnn is their file descriptor. We know this to be unique.
+                                * NOTE: We must do this and not quit the user, even though we do
+                                * not have UID support yet. This is because if we set this user
+                                * as quitting and then introduce the new user before the old one
+                                * has quit, then the user hash gets totally buggered.
+                                * (Yes, that is a technical term). -- Brain
                                 */
                                std::string changeback = ConvToStr(InUse->GetFd()) + "-overruled";
                                InUse->WriteTo(InUse, "NICK %s", changeback.c_str());
@@ -122,6 +137,15 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
        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);
@@ -149,8 +173,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)
        {