X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Frconnect.cpp;h=c5d3a5b523d9b8ab88d0e3b5a395c1f430dcf4d9;hb=9028c48512367394af2f790b53658bc6a197f95e;hp=d4254cac67f951a3cb20e1551a5f206a2c38437d;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index d4254cac6..c5d3a5b52 100644
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -19,19 +19,13 @@
 
 
 #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 "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>";
@@ -39,14 +33,11 @@ CommandRConnect::CommandRConnect (Module* Creator, SpanningTreeUtilities* Util)
 
 CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	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());
+		((ModuleSpanningTree*)(Module*)creator)->RemoteMessage(user, "*** RCONNECT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str());
+		return CMD_FAILURE;
 	}
 
 	/* Is this aimed at our server? */
@@ -58,6 +49,21 @@ CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, U
 		para.push_back(parameters[1]);
 		((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;
 }