#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.
* 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.
* 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;
* 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(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)
return 3;
}
-