Replace std::deque with std::vector in spanningtree and related modules

[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 bd15113bc697d06542c908ec6e725688881d931b..719ff00466024f2d91094231ee66c7c0b6c3b5cb 100644 (file)
--- 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.
@@ -12,48 +12,51 @@
  */
 
 /* $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, User *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)))
+       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.
-               std::deque<std::string> params;
+               parameterlist params;
                params.clear();
-               int n_translate = thiscmd->translation.size();
+               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 (int j = 0; j < pcnt; j++)
+               for (unsigned int j = 0; j < parameters.size(); j++)
                {
                        std::string target;
 
@@ -66,10 +69,18 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const char**
                        else
                                translate_to = TR_TEXT;
 
-                       ServerInstance->Log(DEBUG,"TRANSLATION: %s - type is %d", parameters[j], translate_to);
-                       ServerInstance->Parser->TranslateUIDs(translate_to, parameters[j], target);
-                       
-                       if (j == (pcnt - 1))
+                       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);
+                       }
+
+                       if (j == (parameters.size() - 1))
                                params.push_back(":" + target);
                        else
                                params.push_back(target);