Move destruction logic for User and Spanningtree into cull()

[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 37109a79d30daa3b31f06f8c07bdfadac102fb19..1b1f618b8a2907d7bd5640322840b64c4d8f3009 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.
@@ -14,70 +14,75 @@
 /* $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 "../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 */
 
 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, parameters.size(), user)))
-       {
-               /* Safe, we know its non-null because IsValidModuleCommand returned true */
-               Command* 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();
-               unsigned int n_translate = thiscmd->translation.size();
-               TranslateType translate_to;
+       if (result != CMD_SUCCESS)
+               return;
+       if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user))
+               return;
 
-               /* 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;
+       /* We know it's non-null because IsValidModuleCommand returned true */
+       Command* thiscmd = ServerInstance->Parser->GetHandler(command);
 
-                       /* 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;
+       RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
 
-                       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);
-                       }
+       std::string sent_cmd = command;
+       parameterlist params;
 
-                       if (j == (parameters.size() - 1))
-                               params.push_back(":" + target);
-                       else
-                               params.push_back(target);
+       if (routing.type == ROUTE_TYPE_LOCALONLY)
+       {
+               return;
+       }
+       else if (routing.type == ROUTE_TYPE_OPT_BCAST)
+       {
+               params.push_back("*");
+               params.push_back(command);
+               sent_cmd = "ENCAP";
+       }
+       else if (routing.type == ROUTE_TYPE_OPT_UCAST)
+       {
+               TreeServer* sdest = Utils->FindServer(routing.serverdest);
+               if (!sdest)
+               {
+                       ServerInstance->Logs->Log("m_spanningtree",ERROR,"Trying to route ENCAP to nonexistant server %s",
+                               routing.serverdest.c_str());
+                       return;
                }
-               Utils->DoOneToMany(user->uuid, command, params);
+               params.push_back(sdest->GetID());
+               params.push_back(command);
+               sent_cmd = "ENCAP";
        }
-}
+       else
+       {
+               Module* srcmodule = thiscmd->creator;
+               Version ver = srcmodule->GetVersion();
+
+               if (!(ver.Flags & VF_COMMON))
+               {
+                       ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
+                               command.c_str(), srcmodule->ModuleSourceFile.c_str());
+                       return;
+               }
+       }
+
+       std::string output_text;
+       ServerInstance->Parser->TranslateUIDs(thiscmd->translation, parameters, output_text, true, thiscmd);
 
+       params.push_back(output_text);
+
+       if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST)
+               Utils->DoOneToMany(user->uuid, sent_cmd, params);
+       else
+               Utils->DoOneToOne(user->uuid, sent_cmd, params, routing.serverdest);
+}