X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=4bc321065dde862a520a67d06ccb9c5943c50498;hb=ee7db9bbfbb5f3bc7359d22e7021415aebddb9d2;hp=0cc293fa5d46d3e1d66ff87e79d8fe136a29b7e3;hpb=388e4ff40931dda5870ddef149e54bdcc6c5a711;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 0cc293fa5..4bc321065 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -18,32 +18,39 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "commands.h"
+#include "main.h"
 
 /** ENCAP */
-void TreeSocket::Encap(User* who, parameterlist &params)
+CmdResult CommandEncap::Handle(User* user, Params& params)
 {
-	if (params.size() > 1)
+	if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
 	{
-		if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
-		{
-			parameterlist plist(params.begin() + 2, params.end());
-			ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
-			// discard return value, ENCAP shall succeed even if the command does not exist
-		}
-		
-		params[params.size() - 1] = ":" + params[params.size() - 1];
+		CommandBase::Params plist(params.begin() + 2, params.end());
 
-		if (params[0].find_first_of("*?") != std::string::npos)
+		// XXX: Workaround for SVS* commands provided by spanningtree not being registered in the core
+		if ((params[1] == "SVSNICK") || (params[1] == "SVSJOIN") || (params[1] == "SVSPART"))
 		{
-			Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
+			ServerCommand* const scmd = Utils->Creator->CmdManager.GetHandler(params[1]);
+			if (scmd)
+				scmd->Handle(user, plist);
+			return CMD_SUCCESS;
 		}
-		else
-			Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
+
+		Command* cmd = NULL;
+		ServerInstance->Parser.CallHandler(params[1], plist, user, &cmd);
+		// Discard return value, ENCAP shall succeed even if the command does not exist
+
+		if ((cmd) && (cmd->force_manual_route))
+			return CMD_FAILURE;
 	}
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandEncap::GetRouting(User* user, const Params& params)
+{
+	if (params[0].find_first_of("*?") != std::string::npos)
+		return ROUTE_BROADCAST;
+	return ROUTE_UNICAST(params[0]);
+}