Merge insp20

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

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 2e840c6b82cfe852cdda48ddb574f9684fb354f0..62e200921eb8f92699346b31d4b4f16080d06a76 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -24,15 +24,16 @@
 #include "treeserver.h"
 #include "utils.h"
 #include "commandbuilder.h"
+#include "commands.h"
 
 /*
  * Yes, this function looks a little ugly.
  * However, in some circumstances we may not have a User, so we need to do things this way.
- * Returns 1 if colliding local client, 2 if colliding remote, 3 if colliding both.
+ * Returns true if remote or both lost, false otherwise.
  * Sends SAVEs as appropriate and forces nick change of the user 'u' if our side loses or if both lose.
  * Does not change the nick of the user that is trying to claim the nick of 'u', i.e. the "remote" user.
  */
-int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid)
+bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid, const char* collidecmd)
 {
        // At this point we're sure that a collision happened, increment the counter regardless of who wins
        ServerInstance->stats.Collisions++;
@@ -85,6 +86,10 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
                }
        }
 
+       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Nick collision on \"%s\" caused by %s: %s/%lu/%s@%s %d <-> %s/%lu/%s@%s %d", u->nick.c_str(), collidecmd,
+               u->uuid.c_str(), (unsigned long)localts, u->ident.c_str(), u->GetIPString().c_str(), bChangeLocal,
+               remoteuid.c_str(), (unsigned long)remotets, remoteident.c_str(), remoteip.c_str(), bChangeRemote);
+
        /*
         * Send SAVE and accept the losing client with its UID (as we know the SAVE will
         * not fail under any circumstances -- UIDs are netwide exclusive).
@@ -107,10 +112,7 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
                params.push_back(ConvToStr(u->age));
                params.Broadcast();
 
-               u->ChangeNick(u->uuid);
-
-               if (!bChangeRemote)
-                       return 1;
+               u->ChangeNick(u->uuid, CommandSave::SavedTimestamp);
        }
        if (bChangeRemote)
        {
@@ -118,12 +120,8 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
                 * Remote side needs to change. If this happens, we modify the UID or NICK and
                 * send back a SAVE to the source.
                 */
-               TreeSocket* sock = server->GetSocket();
-               sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets));
-
-               if (!bChangeLocal)
-                       return 2;
+               CmdBuilder("SAVE").push(remoteuid).push_int(remotets).Unicast(server->ServerUser);
        }
 
-       return 3;
+       return bChangeRemote;
 }