Fix module unmapping with culled Module objects

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / rconnect.cpp

diff --git a/src/modules/m_spanningtree/rconnect.cpp b/src/modules/m_spanningtree/rconnect.cpp
index 3275d057e2b3a587a714f1376603e5b8e2922036..5a4c71c3c0283cfed1acf23a3a7cad67a086a831 100644 (file)
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.cpp
@@ -12,11 +12,8 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -28,9 +25,10 @@
 
 /* $ModDep: 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 */
 
-CommandRConnect::CommandRConnect (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RCONNECT", "o", 2), Creator(Callback), Utils(Util)
+CommandRConnect::CommandRConnect (Module* Creator, SpanningTreeUtilities* Util)
+       : Command(Creator, "RCONNECT", 2), Utils(Util)
 {
-       this->source = "m_spanningtree.so";
+       flags_needed = 'o';
        syntax = "<remote-server-mask> <target-server-mask>";
 }
 
@@ -55,8 +53,12 @@ CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, U
                para.push_back(parameters[1]);
                std::string cmd("CONNECT");
                std::string original_command = cmd + " " + parameters[1];
-               Creator->OnPreCommand(cmd, para, user, true, original_command);
+               creator->OnPreCommand(cmd, para, user, true, original_command);
        }
        return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandRConnect::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       return ROUTE_UNICAST(parameters[0]);
+}