X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fsvsnick.cpp;h=59973202ddc06cc52a73a214648eeeaae45986dc;hb=d494c188245e1c80c9556a6a7efafd6fe8f4f6de;hp=82bcd1ff0597288d12b32bf87b7cdcfe5794789c;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/svsnick.cpp b/src/modules/m_spanningtree/svsnick.cpp
index 82bcd1ff0..59973202d 100644
--- a/src/modules/m_spanningtree/svsnick.cpp
+++ b/src/modules/m_spanningtree/svsnick.cpp
@@ -1,68 +1,70 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "transport.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"
+#include "inspircd.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 */
+#include "main.h"
+#include "utils.h"
+#include "commands.h"
 
-/** Because Andy insists that services-compatible servers must
- * implement SVSNICK and SVSJOIN, that's exactly what we do :p
- */
-bool TreeSocket::ForceNick(const std::string &prefix, std::deque<std::string> &params)
+CmdResult CommandSVSNick::Handle(const std::vector<std::string>& parameters, User *user)
 {
-	if (params.size() < 3)
-		return true;
+	User* u = ServerInstance->FindNick(parameters[0]);
 
-	User* u = this->Instance->FindNick(params[0]);
-
-	if (u)
+	if (u && IS_LOCAL(u))
 	{
-		Utils->DoOneToAllButSender(prefix,"SVSNICK",params,prefix);
+		std::string nick = parameters[1];
+		if (isdigit(nick[0]))
+			nick = u->uuid;
 
-		if (IS_LOCAL(u))
-		{
-			std::deque<std::string> par;
-			par.push_back(params[1]);
+		// Don't update the TS if the nick is exactly the same
+		if (u->nick == nick)
+			return CMD_FAILURE;
+
+		time_t NickTS = ConvToInt(parameters[2]);
+		if (NickTS <= 0)
+			return CMD_FAILURE;
 
-			if (!u->ForceNickChange(params[1].c_str()))
+		ModuleSpanningTree* st = (ModuleSpanningTree*)(Module*)creator;
+		st->KeepNickTS = true;
+		u->age = NickTS;
+
+		if (!u->ForceNickChange(nick.c_str()))
+		{
+			/* buh. UID them */
+			if (!u->ForceNickChange(u->uuid.c_str()))
 			{
-				/* buh. UID them */
-				if (!u->ForceNickChange(u->uuid))
-				{
-					User::QuitUser(this->Instance, u, "Nickname collision");
-					return true;
-				}
+				ServerInstance->Users->QuitUser(u, "Nickname collision");
 			}
-
-			u->age = atoi(params[2].c_str());
 		}
+
+		st->KeepNickTS = false;
 	}
 
-	return true;
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandSVSNick::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	User* u = ServerInstance->FindNick(parameters[0]);
+	if (u)
+		return ROUTE_OPT_UCAST(u->server);
+	return ROUTE_LOCALONLY;
+}