X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=95f8f4e4a7da0ea4b7f7f6da73cfc7efda3185c7;hb=9028c48512367394af2f790b53658bc6a197f95e;hp=51194e6d7e902b9af416d2eb5cb172f3bb70efcc;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 51194e6d7..95f8f4e4a 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -18,32 +18,28 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "commands.h"
 
 /** ENCAP */
-void TreeSocket::Encap(User* who, parameterlist &params)
+CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& 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];
+		parameterlist plist(params.begin() + 2, params.end());
+		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 (params[0].find('*') != std::string::npos)
-		{
-			Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
-		}
-		else
-			Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
+		if ((cmd) && (cmd->force_manual_route))
+			return CMD_FAILURE;
 	}
+	return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandEncap::GetRouting(User* user, const std::vector<std::string>& params)
+{
+	if (params[0].find_first_of("*?") != std::string::npos)
+		return ROUTE_BROADCAST;
+	return ROUTE_UNICAST(params[0]);
+}