X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fnickcollide.cpp;h=edc1ac6ff0a1dcddcf6208c673da75354656d36a;hb=7e7e773d4d43e68c18c19e2ec712f4250e5f756d;hp=5d36bc46f4e74c6be267b0495e71c776d0967879;hpb=f57b33efe868200133a9839a6f1513a99cf9ab58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index 5d36bc46f..edc1ac6ff 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -1,68 +1,62 @@ -/* +------------------------------------+ - * | 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 "commands/cmd_whois.h" -#include "commands/cmd_stats.h" -#include "socket.h" -#include "wildcard.h" -#include "xline.h" -#include "transport.h" -#include "m_hash.h" -#include "socketengine.h" - -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/link.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/resolvers.h" -#include "m_spanningtree/handshaketimer.h" - -/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.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 char *remoteident, const char *remoteip, const char *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. - * 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; bool bChangeRemote = true; - /* for brevity, don't use the User */ - time_t localts = u->age; - const char *localident = u->ident; - const char *localip = u->GetIPString(); + /* for brevity, don't use the User - use defines to avoid any copy */ + #define localts u->age + #define localident u->ident + #define localip u->GetIPString() /* mmk. let's do this again. */ if (remotets == localts) @@ -74,8 +68,8 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const char *remoteident, c /* fuck. now it gets complex. */ /* first, let's see if ident@host matches. */ - bool SamePerson = !strcmp(localident, remoteident) - && !strcmp(localip, remoteip); + bool SamePerson = (localident == remoteident) + && (localip == remoteip); /* * if ident@ip is equal, and theirs is newer, or @@ -94,9 +88,29 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const char *remoteident, c } } + /* + * 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) { + /* + * 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->ForceNickChange(u->uuid); if (!bChangeRemote) @@ -104,28 +118,19 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const char *remoteident, c } 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(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(remotets)); if (remote) { - /* buh.. nick change collide. force change their nick. */ - remote->ForceNickChange(remote->uuid); - } - 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->ForceNickChange(remoteuid); } if (!bChangeLocal)