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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 12ab2b664..4bc321065 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -20,20 +20,35 @@
 #include "inspircd.h"
 
 #include "commands.h"
+#include "main.h"
 
 /** ENCAP */
-CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
+CmdResult CommandEncap::Handle(User* user, Params& params)
 {
 	if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
 	{
-		parameterlist plist(params.begin() + 2, params.end());
-		ServerInstance->Parser->CallHandler(params[1], plist, user);
+		CommandBase::Params plist(params.begin() + 2, params.end());
+
+		// XXX: Workaround for SVS* commands provided by spanningtree not being registered in the core
+		if ((params[1] == "SVSNICK") || (params[1] == "SVSJOIN") || (params[1] == "SVSPART"))
+		{
+			ServerCommand* const scmd = Utils->Creator->CmdManager.GetHandler(params[1]);
+			if (scmd)
+				scmd->Handle(user, plist);
+			return CMD_SUCCESS;
+		}
+
+		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 std::vector<std::string>& params)
+RouteDescriptor CommandEncap::GetRouting(User* user, const Params& params)
 {
 	if (params[0].find_first_of("*?") != std::string::npos)
 		return ROUTE_BROADCAST;