X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=e6bcb21b29cf6f36a0b8f8a7e83b345f8d98f5c7;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=a33b77da412f8e0b8e6d4851692dc89b9a6604ab;hpb=8684e3332cd69015f94d25ed8e6ff6f9d5d20238;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index a33b77da4..e6bcb21b2 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -1,49 +1,56 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -#include "xline.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/utils.h" - -/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */ +#include "inspircd.h" +#include "treesocket.h" +#include "treeserver.h" +#include "utils.h" +#include "commandbuilder.h" /* * 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) +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. + * Under old protocol rules, we would have had to kill both clients. + * Really, this sucks. * These days, we have UID. And, so what we do is, force nick change client(s) * involved according to timestamp rules. * - * RULES: - * user@ip equal: - * Force nick change on OLDER timestamped client - * user@ip differ: - * Force nick change on NEWER timestamped client - * TS EQUAL: - * FNC both. - * - * This stops abusive use of collisions, simplifies problems with loops, and so on. + * RULES: + * user@ip equal: + * Force nick change on OLDER timestamped client + * user@ip differ: + * Force nick change on NEWER timestamped client + * TS EQUAL: + * FNC both. + * + * This stops abusive use of collisions, simplifies problems with loops, and so on. * -- w00t */ bool bChangeLocal = true; @@ -84,38 +91,49 @@ 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 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 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 + */ if (bChangeLocal) { - u->ForceNickChange(u->uuid.c_str()); + /* + * Local-side nick needs to change. Just in case we are hub, and + * this "local" nick is actually behind us, send an SAVE out. + */ + CmdBuilder params("SAVE"); + params.push_back(u->uuid); + params.push_back(ConvToStr(u->age)); + params.Broadcast(); + + u->ChangeNick(u->uuid); if (!bChangeRemote) return 1; } if (bChangeRemote) { + User *remote = ServerInstance->FindUUID(remoteuid); /* - * Cheat a little here. Instead of a dedicated command to change UID, - * use SVSNICK and accept their client with it's UID (as we know the SVSNICK 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 - * be dropped harmlessly as it will come in as :928AAAB NICK 928AAAB, and we already - * have 928AAAB's nick set to that. - * -- w00t + * 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 SAVE */ - User *remote = this->Instance->FindUUID(remoteuid); + TreeSocket* sock = server->GetSocket(); + sock->WriteLine(CmdBuilder("SAVE").push(remoteuid).push_int(remotets)); if (remote) { - /* buh.. nick change collide. force change their nick. */ - remote->ForceNickChange(remote->uuid.c_str()); - } - else - { - /* user has not been introduced yet, just inform their server */ - this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" SVSNICK "+remoteuid+" " + remoteuid + " " + ConvToStr(remotets)); + /* nick change collide. Force change their nick. */ + remote->ChangeNick(remoteuid); } if (!bChangeLocal) @@ -124,4 +142,3 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei return 3; } -