Merge pull request #1351 from SaberUK/master+webirc

[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 fedadedb5d9ce60970e98c613969e9fe3fa3d35d..8059d2a39ce5b4ee5c605fd888b6395e98d090b5 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -18,31 +18,39 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
-#include "treesocket.h"
-#include "utils.h"
+#include "commands.h"
+#include "main.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());
+
+               // XXX: Workaround for SVS* commands provided by spanningtree not being registered in the core
+               if ((params[1] == "SVSNICK") || (params[1] == "SVSJOIN") || (params[1] == "SVSPART"))
                {
-                       parameterlist plist(params.begin() + 2, params.end());
-                       ServerInstance->Parser->CallHandler(params[1], plist, who);
-                       // discard return value, ENCAP shall succeed even if the command does not exist
+                       ServerCommand* const scmd = Utils->Creator->CmdManager.GetHandler(params[1]);
+                       if (scmd)
+                               scmd->Handle(user, plist);
+                       return CMD_SUCCESS;
                }
 
-               params[params.size() - 1] = ":" + params[params.size() - 1];
+               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_first_of("*?") != 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]);
+}