X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=719ff00466024f2d91094231ee66c7c0b6c3b5cb;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=d63fff686273eb688ca36c992197d99cfe03e88e;hpb=d185decae97752368d5cf62311cbc0d1a52aa22c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index d63fff686..719ff0046 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	  the file COPYING for details.
@@ -17,21 +17,15 @@
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
 
-#include "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
-#include "m_spanningtree/rsquit.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
 void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, User *user, CmdResult result, const std::string &original_line)
 {
@@ -39,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;
@@ -67,7 +70,15 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 				translate_to = TR_TEXT;
 
 			ServerInstance->Logs->Log("m_spanningtree",DEBUG,"TRANSLATION: %s - type is %d", parameters[j].c_str(), translate_to);
-			ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
+			if (translate_to == TR_CUSTOM)
+			{
+				target = parameters[j];
+				thiscmd->EncodeParameter(target, j);
+			}
+			else
+			{
+				ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
+			}
 
 			if (j == (parameters.size() - 1))
 				params.push_back(":" + target);