X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Frconnect.cpp;h=36169233a4ae61b6ac80e22c41fb06e7679cbc15;hb=b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3;hp=5a4c71c3c0283cfed1acf23a3a7cad67a086a831;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 5a4c71c3c..36169233a 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -1,47 +1,49 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <brain@inspircd.org>
  *
- * 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 "socket.h"
-#include "xline.h"
 
-#include "resolvers.h"
 #include "main.h"
 #include "utils.h"
-#include "treeserver.h"
-#include "link.h"
-#include "treesocket.h"
-#include "rconnect.h"
-
-/* $ModDep: 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_spanningtree/rconnect.h */
+#include "commands.h"
 
-CommandRConnect::CommandRConnect (Module* Creator, SpanningTreeUtilities* Util)
-	: Command(Creator, "RCONNECT", 2), Utils(Util)
+CommandRConnect::CommandRConnect (Module* Creator)
+	: Command(Creator, "RCONNECT", 2)
 {
 	flags_needed = 'o';
 	syntax = "<remote-server-mask> <target-server-mask>";
 }
 
-CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandRConnect::Handle(User* user, const Params& parameters)
 {
-	if (IS_LOCAL(user))
+	/* First see if the server which is being asked to connect to another server in fact exists */
+	if (!Utils->FindServerMask(parameters[0]))
 	{
-		if (!Utils->FindServerMask(parameters[0]))
-		{
-			user->WriteServ("NOTICE %s :*** RCONNECT: Server \002%s\002 isn't connected to the network!", user->nick.c_str(), parameters[0].c_str());
-			return CMD_FAILURE;
-		}
-		user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str());
+		user->WriteRemoteNotice(InspIRCd::Format("*** RCONNECT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str()));
+		return CMD_FAILURE;
 	}
 
 	/* Is this aimed at our server? */
@@ -49,16 +51,29 @@ CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, U
 	{
 		/* Yes, initiate the given connect */
 		ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str());
-		std::vector<std::string> para;
+		CommandBase::Params para;
 		para.push_back(parameters[1]);
-		std::string cmd("CONNECT");
-		std::string original_command = cmd + " " + parameters[1];
-		creator->OnPreCommand(cmd, para, user, true, original_command);
+		((ModuleSpanningTree*)(Module*)creator)->HandleConnect(para, user);
+	}
+	else
+	{
+		/* It's not aimed at our server, but if the request originates from our user
+		 * acknowledge that we sent the request.
+		 *
+		 * It's possible that we're asking a server for something that makes no sense
+		 * (e.g. connect to itself or to an already connected server), but we don't check
+		 * for those conditions here, as ModuleSpanningTree::HandleConnect() (which will run
+		 * on the target) does all the checking and error reporting.
+		 */
+		if (IS_LOCAL(user))
+		{
+			user->WriteNotice("*** RCONNECT: Sending remote connect to \002 " + parameters[0] + "\002 to connect server \002" + parameters[1] + "\002.");
+		}
 	}
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandRConnect::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandRConnect::GetRouting(User* user, const Params& parameters)
 {
 	return ROUTE_UNICAST(parameters[0]);
 }