Increment serverstats::Collisions when a collision is handled, not when a module...

[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 2acce9fdce548db607149e95df5251706fb2018e..30be98fb5b89317448c856fae1a6f6a8201ae461 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -21,10 +21,9 @@
 #include "inspircd.h"
 
 #include "treesocket.h"
+#include "treeserver.h"
 #include "utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treesocket.h */
-
+#include "commandbuilder.h"
 
 /*
  * Yes, this function looks a little ugly.
@@ -32,8 +31,11 @@
  * Returns 1 if colliding local client, 2 if colliding remote, 3 if colliding both.
  * Sends SAVEs as appropriate and forces nickchanges too.
  */
-int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remoteident, const std::string &remoteip, const std::string &remoteuid)
+int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remotets, const std::string& remoteident, const std::string& remoteip, const std::string& remoteuid)
 {
+       // At this point we're sure that a collision happened, increment the counter regardless of who wins
+       ServerInstance->stats.Collisions++;
+
        /*
         * Under old protocol rules, we would have had to kill both clients.
         * Really, this sucks.
@@ -107,10 +109,10 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
                 * Local-side nick needs to change. Just in case we are hub, and
                 * this "local" nick is actually behind us, send an SAVE out.
                 */
-               parameterlist params;
+               CmdBuilder params("SAVE");
                params.push_back(u->uuid);
                params.push_back(ConvToStr(u->age));
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+               params.Broadcast();
 
                u->ForceNickChange(u->uuid);
 
@@ -125,7 +127,8 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
                 * the UID or halt the propagation of the nick change command,
                 * so other servers don't need to see the SAVE
                 */
-               WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
+               TreeSocket* sock = server->GetSocket();
+               sock->WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
 
                if (remote)
                {
@@ -139,4 +142,3 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 
        return 3;
 }
-