X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=e6bcb21b29cf6f36a0b8f8a7e83b345f8d98f5c7;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=5cb4344bf891993a70d086adf2bf80aa63a961e0;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 5cb4344bf..e6bcb21b2 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -19,14 +19,11 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
 #include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
+#include "commandbuilder.h"
 
 /*
  * Yes, this function looks a little ugly.
@@ -34,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.
@@ -109,12 +109,12 @@ 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.c_str());
+		u->ChangeNick(u->uuid);
 
 		if (!bChangeRemote)
 			return 1;
@@ -127,12 +127,13 @@ 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(std::string(":")+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
+		TreeSocket* sock = server->GetSocket();
+		sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets));
 
 		if (remote)
 		{
 			/* nick change collide. Force change their nick. */
-			remote->ForceNickChange(remoteuid.c_str());
+			remote->ChangeNick(remoteuid);
 		}
 
 		if (!bChangeLocal)
@@ -141,4 +142,3 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 
 	return 3;
 }
-