#include "treesocket.h"
#include "treeserver.h"
#include "utils.h"
+#include "commandbuilder.h"
/*
* Yes, this function looks a little ugly.
*/
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));
- this->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+ params.Broadcast();
- u->ForceNickChange(u->uuid);
+ u->ChangeNick(u->uuid);
if (!bChangeRemote)
return 1;
* 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)
return 3;
}
-