m_spanningtree Allow multiple valid ips for link blocks as a result of SecurityIPResolver

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / encap.cpp

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 566f15da88d0298ee49c1b2bceda14b7ea7603ee..8059d2a39ce5b4ee5c605fd888b6395e98d090b5 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -20,6 +20,7 @@
 #include "inspircd.h"
 
 #include "commands.h"
+#include "main.h"
 
 /** ENCAP */
 CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
@@ -27,8 +28,18 @@ CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
        if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
        {
                parameterlist 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))