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

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 44476c8c7..719ff0046 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -2,79 +2,90 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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.
+ *	  the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 /* $ModDesc: Provides a spanning tree server link protocol */
-                
+
 #include "inspircd.h"
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "wildcard.h"
-#include "xline.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 "xline.h"
+#include "../transport.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 char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, User *user, CmdResult result, const std::string &original_line)
 {
-        if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
-        {
-                /* Safe, we know its non-null because IsValidModuleCommand returned true */
-                command_t* thiscmd = ServerInstance->Parser->GetHandler(command);
-                // 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;
-                params.clear();
-                int n_translate = thiscmd->translation.size();
-                TranslateType translate_to;
+	if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, parameters.size(), user)))
+	{
+		/* 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.
+		parameterlist params;
+		params.clear();
+		unsigned int n_translate = thiscmd->translation.size();
+		TranslateType translate_to;
+
+		/* To make sure that parameters with spaces, or empty
+		 * parameters, etc, are always sent properly, *always*
+		 * prefix the last parameter with a :. This also removes
+		 * an extra strchr() */
+		for (unsigned int j = 0; j < parameters.size(); j++)
+		{
+			std::string target;
 
-                /* To make sure that parameters with spaces, or empty
-                 * parameters, etc, are always sent properly, *always*
-                 * prefix the last parameter with a :. This also removes
-                 * an extra strchr() */
-                for (int j = 0; j < pcnt; j++)
-                {
-                        std::string target;
+			/* Map all items to UUIDs where neccessary */
+			if (j < n_translate)
+			{
+				/* We have a translation mapping for this index */
+				translate_to = thiscmd->translation[j] != TR_END ? thiscmd->translation[j] : TR_TEXT;
+			}
+			else
+				translate_to = TR_TEXT;
 
-                        /* Map all items to UUIDs where neccessary */
-                        if (j < n_translate)
-                        {
-                                /* We have a translation mapping for this index */
-                                translate_to = thiscmd->translation[j] != TR_END ? thiscmd->translation[j] : TR_TEXT;
-                        }
-                        else
-                                translate_to = TR_TEXT;
+			ServerInstance->Logs->Log("m_spanningtree",DEBUG,"TRANSLATION: %s - type is %d", parameters[j].c_str(), translate_to);
+			if (translate_to == TR_CUSTOM)
+			{
+				target = parameters[j];
+				thiscmd->EncodeParameter(target, j);
+			}
+			else
+			{
+				ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
+			}
 
-                        ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to);
-                        ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
-                        
-                        if (j == (pcnt - 1))
-                                params.push_back(":" + target);
-                        else
-                                params.push_back(target);
-                }
-                Utils->DoOneToMany(user->uuid, command, params);
-        }
+			if (j == (parameters.size() - 1))
+				params.push_back(":" + target);
+			else
+				params.push_back(target);
+		}
+		Utils->DoOneToMany(user->uuid, command, params);
+	}
 }