X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=67a21a4844a1bd1f7b729851f6d9d07a8d85b1b3;hb=bd2236348ab57ddb358c770002b75291e2f931bd;hp=5152ef274185e8938994b2f4e936c6ea6823c438;hpb=845135ba55d2bad81588a80546c8abe2b76ed47c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index 5152ef274..67a21a484 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 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 "commands.h"
 
@@ -33,13 +41,15 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	time_t age_t = ConvToInt(params[1]);
 	time_t signon = ConvToInt(params[7]);
 	std::string empty;
-	std::string nick(params[2]);
 	std::string modestr(params[8]);
 
 	TreeServer* remoteserver = Utils->FindServer(serversrc->server);
 
 	if (!remoteserver)
 		return CMD_INVALID;
+	/* Is this a valid UID, and not misrouted? */
+	if (params[0].length() != 9 || params[0].substr(0,3) != serversrc->uuid)
+		return CMD_INVALID;
 	/* Check parameters for validity before introducing the client, discovered by dmb */
 	if (!age_t)
 		return CMD_INVALID;
@@ -50,7 +60,7 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	TreeSocket* sock = remoteserver->GetRoute()->GetSocket();
 
 	/* check for collision */
-	user_hash::iterator iter = ServerInstance->Users->clientlist->find(nick);
+	user_hash::iterator iter = ServerInstance->Users->clientlist->find(params[2]);
 
 	if (iter != ServerInstance->Users->clientlist->end())
 	{
@@ -62,8 +72,12 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 
 		if (collide != 1)
 		{
-			/* remote client changed, make sure we change their nick for the hash too */
-			nick = params[0];
+			/* remote client lost, make sure we change their nick for the hash too
+			 *
+			 * This alters the line that will be sent to other servers, which
+			 * commands normally shouldn't do; hence the required const_cast.
+			 */
+			const_cast<parameterlist&>(params)[2] = params[0];
 		}
 	}
 
@@ -77,10 +91,11 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	}
 	catch (...)
 	{
+		ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Duplicate UUID %s in client introduction", params[0].c_str());
 		return CMD_INVALID;
 	}
-	(*(ServerInstance->Users->clientlist))[nick] = _new;
-	_new->nick = nick;
+	(*(ServerInstance->Users->clientlist))[params[2]] = _new;
+	_new->nick = params[2];
 	_new->host = params[3];
 	_new->dhost = params[4];
 	_new->ident = params[5];
@@ -97,9 +112,6 @@ CmdResult CommandUID::Handle(const parameterlist &params, User* serversrc)
 	unsigned int paramptr = 9;
 	for (std::string::iterator v = modestr.begin(); v != modestr.end(); v++)
 	{
-		if (*v == '+')
-			continue;
-
 		/* For each mode thats set, increase counter */
 		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);