X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=3f509bc5cbd28839ab05ec5d85e767a9b79220f8;hb=HEAD;hp=566f15da88d0298ee49c1b2bceda14b7ea7603ee;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 566f15da8..3f509bc5c 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,7 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -20,15 +25,26 @@
 #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());
+		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);
+		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))
@@ -37,7 +53,7 @@ CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
 	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;