X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=4481ba35e1a37996ec9add9d80e8f87271a30779;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=827befeaa55506a58c1a67214ee7f80ab3923c04;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 827befeaa..4481ba35e 100644
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -14,9 +14,9 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -25,7 +25,7 @@
  * 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.
- * Sends SVSNICKs as appropriate and forces nickchanges too.
+ * 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)
 {
@@ -86,11 +86,11 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 
 	/*
 	 * Cheat a little here. Instead of a dedicated command to change UID,
-	 * use SVSNICK and accept the losing client with its UID (as we know the SVSNICK will
+	 * use SAVE and accept the losing client with its UID (as we know the SAVE will
 	 * not fail under any circumstances -- UIDs are netwide exclusive).
 	 *
 	 * This means that each side of a collide will generate one extra NICK back to where
-	 * they have just linked (and where it got the SVSNICK from), however, it will
+	 * they have just linked (and where it got the SAVE from), however, it will
 	 * be dropped harmlessly as it will come in as :928AAAB NICK 928AAAB, and we already
 	 * have 928AAAB's nick set to that.
 	 *   -- w00t
@@ -100,13 +100,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 SVSNICK out.
+		 * this "local" nick is actually behind us, send an SAVE out.
 		 */
-		std::deque<std::string> params;
-		params.push_back(u->uuid);
+		parameterlist params;
 		params.push_back(u->uuid);
 		params.push_back(ConvToStr(u->age));
-		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SVSNICK",params);
+		Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
 
 		u->ForceNickChange(u->uuid.c_str());
 
@@ -115,13 +114,13 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
 	}
 	if (bChangeRemote)
 	{
-		User *remote = this->ServerInstance->FindUUID(remoteuid);
+		User *remote = ServerInstance->FindUUID(remoteuid);
 		/*
 		 * remote side needs to change. If this happens, we will modify
 		 * the UID or halt the propagation of the nick change command,
-		 * so other servers don't need to see the SVSNICK
+		 * so other servers don't need to see the SAVE
 		 */
-		WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" SVSNICK "+remoteuid+" " + remoteuid + " " + ConvToStr(remotets));
+		WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets));
 
 		if (remote)
 		{