Remove superfluous std::string()s

[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 6c4a837a55375751e0936d7ca6377fe56171f328..38d59affb401e530fa5daddf722e25b595a22461 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -1,22 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2009 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 <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.h"
 
 /* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -25,13 +32,13 @@
  * 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)
 {
        /*
-        *  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.
         *
@@ -84,9 +91,29 @@ 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)
        {
+               /*
+                * 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;
+               params.push_back(u->uuid);
+               params.push_back(ConvToStr(u->age));
+               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+
                u->ForceNickChange(u->uuid.c_str());
 
                if (!bChangeRemote)
@@ -94,28 +121,18 @@ int TreeSocket::DoCollision(User *u, time_t remotets, const std::string &remotei
        }
        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->ServerInstance->FindUUID(remoteuid);
+               WriteLine(":"+ServerInstance->Config->GetSID()+" SAVE "+remoteuid+" "+ ConvToStr(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->ServerInstance->Config->GetSID()+" SVSNICK "+remoteuid+" " + remoteuid + " " + ConvToStr(remotets));
+                       /* nick change collide. Force change their nick. */
+                       remote->ForceNickChange(remoteuid.c_str());
                }
 
                if (!bChangeLocal)