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

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index e849c69ae..e6bcb21b2 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -23,6 +23,7 @@
 #include "treesocket.h"
 #include "treeserver.h"
 #include "utils.h"
+#include "commandbuilder.h"
 
 /*
  * Yes, this function looks a little ugly.
@@ -32,6 +33,9 @@
  */
 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.
@@ -105,12 +109,12 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
 		 * 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));
-		this->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+		params.Broadcast();
 
-		u->ForceNickChange(u->uuid);
+		u->ChangeNick(u->uuid);
 
 		if (!bChangeRemote)
 			return 1;
@@ -124,12 +128,12 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
 		 * so other servers don't need to see the SAVE
 		 */
 		TreeSocket* sock = server->GetSocket();
-		sock->WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
+		sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets));
 
 		if (remote)
 		{
 			/* nick change collide. Force change their nick. */
-			remote->ForceNickChange(remoteuid);
+			remote->ChangeNick(remoteuid);
 		}
 
 		if (!bChangeLocal)
@@ -138,4 +142,3 @@ int SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remot
 
 	return 3;
 }
-