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 428079c23f31d997db2131ec1289e856343b6d94..1b1f618b8a2907d7bd5640322840b64c4d8f3009 100644 (file)
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -14,8 +14,6 @@
 /* $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 "xline.h"
 #include "../transport.h"
@@ -39,25 +37,52 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 
        RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
 
+       std::string sent_cmd = command;
+       parameterlist params;
+
        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;
+               }
+               params.push_back(sdest->GetID());
+               params.push_back(command);
+               sent_cmd = "ENCAP";
+       }
+       else
+       {
+               Module* srcmodule = thiscmd->creator;
+               Version ver = srcmodule->GetVersion();
 
-       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;
+               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);
 
-       parameterlist params;
        params.push_back(output_text);
 
-       if (routing.type == ROUTE_TYPE_BROADCAST)
-               Utils->DoOneToMany(user->uuid, command, params);
+       if (routing.type == ROUTE_TYPE_BROADCAST || routing.type == ROUTE_TYPE_OPT_BCAST)
+               Utils->DoOneToMany(user->uuid, sent_cmd, params);
        else
-               Utils->DoOneToOne(user->uuid, command, params, routing.serverdest);
+               Utils->DoOneToOne(user->uuid, sent_cmd, params, routing.serverdest);
 }