m_spanningtree Introduce command builders

[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 3d29e402a7ffc0470edc53220d16334da7c5706a..edc1ac6ff0a1dcddcf6208c673da75354656d36a 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -21,7 +21,9 @@
 #include "inspircd.h"
 
 #include "treesocket.h"
+#include "treeserver.h"
 #include "utils.h"
+#include "commandbuilder.h"
 
 /*
  * Yes, this function looks a little ugly.
@@ -29,7 +31,7 @@
  * 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)
 {
        /*
         * Under old protocol rules, we would have had to kill both clients.
@@ -104,10 +106,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);
 
@@ -122,7 +124,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)
                {