Fix some regressions in sending tags between servers.

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

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 57fbca6bc3835e97774b4282b5fb930b162285b8..10cbbce82f92d8a34312549c34d530501cbdef52 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -24,13 +24,13 @@
 #include "treeserver.h"
 #include "commandbuilder.h"
 
-void ModuleSpanningTree::OnPostCommand(Command* command, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line)
+void ModuleSpanningTree::OnPostCommand(Command* command, const CommandBase::Params& parameters, LocalUser* user, CmdResult result, bool loop)
 {
        if (result == CMD_SUCCESS)
                Utils->RouteCommand(NULL, command, parameters, user);
 }
 
-void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscmd, const parameterlist& parameters, User* user)
+void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscmd, const CommandBase::Params& parameters, User* user)
 {
        const std::string& command = thiscmd->name;
        RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
@@ -39,23 +39,34 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 
        const bool encap = ((routing.type == ROUTE_TYPE_OPT_BCAST) || (routing.type == ROUTE_TYPE_OPT_UCAST));
        CmdBuilder params(user, encap ? "ENCAP" : command.c_str());
+       params.push_tags(parameters.GetTags());
+       TreeServer* sdest = NULL;
 
        if (routing.type == ROUTE_TYPE_OPT_BCAST)
        {
                params.push('*');
-               params.push_back(command);
+               params.push(command);
        }
-       else if (routing.type == ROUTE_TYPE_OPT_UCAST)
+       else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST)
        {
-               TreeServer* sdest = FindServer(routing.serverdest);
+               sdest = static_cast<TreeServer*>(routing.server);
                if (!sdest)
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route ENCAP to nonexistant server %s",
-                               routing.serverdest.c_str());
-                       return;
+                       // Assume the command handler already validated routing.serverdest and have only returned success if the target is something that the
+                       // user executing the command is allowed to look up e.g. target is not an uuid if user is local.
+                       sdest = FindRouteTarget(routing.serverdest);
+                       if (!sdest)
+                       {
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route %s%s to nonexistent server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.serverdest.c_str());
+                               return;
+                       }
+               }
+
+               if (encap)
+               {
+                       params.push(sdest->GetID());
+                       params.push(command);
                }
-               params.push_back(sdest->GetID());
-               params.push_back(command);
        }
        else
        {
@@ -72,7 +83,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 
        std::string output_text = CommandParser::TranslateUIDs(thiscmd->translation, parameters, true, thiscmd);
 
-       params.push_back(output_text);
+       params.push(output_text);
 
        if (routing.type == ROUTE_TYPE_MESSAGE)
        {
@@ -81,7 +92,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
                if (ServerInstance->Modes->FindPrefix(dest[0]))
                {
                        pfx = dest[0];
-                       dest = dest.substr(1);
+                       dest.erase(dest.begin());
                }
                if (dest[0] == '#')
                {
@@ -90,7 +101,10 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
                                return;
                        // TODO OnBuildExemptList hook was here
                        CUList exempts;
-                       SendChannelMessage(user->uuid, c, parameters[1], pfx, exempts, command.c_str(), origin ? origin->GetSocket() : NULL);
+                       std::string message;
+                       if (parameters.size() >= 2)
+                               message.assign(parameters[1]);
+                       SendChannelMessage(user, c, message, pfx, parameters.GetTags(), exempts, command.c_str(), origin ? origin->GetSocket() : NULL);
                }
                else if (dest[0] == '$')
                {
@@ -100,9 +114,9 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
                {
                        // user target?
                        User* d = ServerInstance->FindNick(dest);
-                       if (!d)
+                       if (!d || IS_LOCAL(d))
                                return;
-                       TreeServer* tsd = BestRouteTo(d->server);
+                       TreeServer* tsd = TreeServer::Get(d)->GetRoute();
                        if (tsd == origin)
                                // huh? no routing stuff around in a circle, please.
                                return;
@@ -115,8 +129,6 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
        }
        else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST)
        {
-               if (origin && routing.serverdest == origin->GetName())
-                       return;
-               params.Unicast(routing.serverdest);
+               params.Unicast(sdest->ServerUser);
        }
 }