m_spanningtree Update comments around collision handling

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / nick.cpp

diff --git a/src/modules/m_spanningtree/nick.cpp b/src/modules/m_spanningtree/nick.cpp
index 49ce9a767153cc7baf5513cf8a5e65430bb44efb..cdec280e1331af10255c61f405611149bbe17df5 100644 (file)
--- a/src/modules/m_spanningtree/nick.cpp
+++ b/src/modules/m_spanningtree/nick.cpp
@@ -33,7 +33,7 @@
 CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>& params)
 {
        if ((isdigit(params[0][0])) && (params[0] != user->uuid))
-               return CMD_INVALID;
+               throw ProtocolException("Attempted to change nick to an invalid or non-matching UUID");
 
        /* Update timestamp on user when they change nicks */
        const time_t newts = ConvToInt(params[1]);
@@ -43,20 +43,20 @@ CmdResult CommandNick::HandleRemote(RemoteUser* user, std::vector<std::string>&
         * If it does, perform collision logic.
         */
        User* x = ServerInstance->FindNickOnly(params[0]);
-       if ((x) && (x != user))
+       if ((x) && (x != user) && (x->registered == REG_ALL))
        {
-               /* x is local, who is remote */
+               // 'x' is the already existing user using the same nick as params[0]
+               // 'user' is the user trying to change nick to the in use nick
                int collideret = Utils->DoCollision(x, TreeServer::Get(user), newts, user->ident, user->GetIPString(), user->uuid);
                if (collideret != 1)
                {
-                       /*
-                        * Remote client lost, or both lost, parsing or passing on this
-                        * nickchange would be pointless, as the incoming client's server will
-                        * soon receive SAVE to change its nick to its UID. :) -- w00t
-                        */
-                       return CMD_FAILURE;
+                       // Remote client lost, or both lost, rewrite this nick change as a change to uuid before
+                       // calling ChangeNick() and forwarding the message
+                       params[0] = user->uuid;
                }
        }
-       user->ForceNickChange(params[0], newts);
+
+       user->ChangeNick(params[0], newts);
+
        return CMD_SUCCESS;
 }