Remove unused I_ProtoSendMetaData, I_ProtoSendMode fields of Implementation

[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 76ece27f90a70b1fc178a89ce8a6985ff1b8aa29..719ff00466024f2d91094231ee66c7c0b6c3b5cb 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -18,12 +18,12 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/treesocket.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
@@ -33,12 +33,21 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
        {
                /* Safe, we know its non-null because IsValidModuleCommand returned true */
                Command* thiscmd = ServerInstance->Parser->GetHandler(command);
+
+               Module* srcmodule = ServerInstance->Modules->Find(thiscmd->source);
+
+               if (srcmodule && !(srcmodule->GetVersion().Flags & VF_COMMON)) {
+                       ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
+                               command.c_str(), thiscmd->source.c_str());
+                       return;
+               }
+
                // this bit of code cleverly routes all module commands
                // to all remote severs *automatically* so that modules
                // can just handle commands locally, without having
                // to have any special provision in place for remote
                // commands and linking protocols.
-               std::deque<std::string> params;
+               parameterlist params;
                params.clear();
                unsigned int n_translate = thiscmd->translation.size();
                TranslateType translate_to;
@@ -68,7 +77,7 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
                        }
                        else
                        {
-                               ServerInstance->Parser->TranslateUIDsOnce(translate_to, parameters[j], target);
+                               ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
                        }
 
                        if (j == (parameters.size() - 1))