X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Frsquit.cpp;h=7edb9501aa18ae7b4fac26986df3f96a1e511895;hb=b4599531f97a9e6207b6bb8d728d7523b6995523;hp=be658120b3056f0b10e1c93c34ff89701f569d8e;hpb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index be658120b..7edb9501a 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -20,54 +20,47 @@
 
 #include "inspircd.h"
 
+#include "main.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "commands.h"
 
-CommandRSQuit::CommandRSQuit (Module* Creator, SpanningTreeUtilities* Util)
-	: Command(Creator, "RSQUIT", 1), Utils(Util)
+CommandRSQuit::CommandRSQuit(Module* Creator)
+	: Command(Creator, "RSQUIT", 1)
 {
 	flags_needed = 'o';
-	syntax = "<target-server-mask> [reason]";
+	syntax = "<target-server-mask> [:<reason>]";
 }
 
-CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandRSQuit::Handle(User* user, const Params& parameters)
 {
 	TreeServer *server_target; // Server to squit
-	TreeServer *server_linked; // Server target is linked to
 
 	server_target = Utils->FindServerMask(parameters[0]);
 	if (!server_target)
 	{
-		((ModuleSpanningTree*)(Module*)creator)->RemoteMessage(user, "*** RSQUIT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str());
+		user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Server \002%s\002 isn't connected to the network!", parameters[0].c_str()));
 		return CMD_FAILURE;
 	}
 
-	if (server_target == Utils->TreeRoot)
+	if (server_target->IsRoot())
 	{
-		((ModuleSpanningTree*)(Module*)creator)->RemoteMessage(user, "*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)", parameters[0].c_str());
+		user->WriteRemoteNotice(InspIRCd::Format("*** RSQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)", parameters[0].c_str()));
 		return CMD_FAILURE;
 	}
 
-	server_linked = server_target->GetParent();
-
-	if (server_linked == Utils->TreeRoot)
+	if (server_target->IsLocal())
 	{
 		// We have been asked to remove server_target.
-		TreeSocket* sock = server_target->GetSocket();
-		if (sock)
-		{
-			const char *reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason";
-			ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason);
-			sock->Squit(server_target, "Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
-			sock->Close();
-		}
+		const char* reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason";
+		ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason);
+		server_target->SQuit("Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
 	}
 
 	return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandRSQuit::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandRSQuit::GetRouting(User* user, const Params& parameters)
 {
 	return ROUTE_UNICAST(parameters[0]);
 }