Merge remote/local MODULES output

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

diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index ceaee99d6ca2fe8719f4d3bd7fb5df3838c80263..194536c478a1771d47a2cbe4efb613098c8340c1 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,23 +12,22 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.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 "m_spanningtree/rsquit.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "rsquit.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
 
-CommandRSQuit::CommandRSQuit (InspIRCd* Instance, Module* Callback, SpanningTreeUtilities* Util) : Command(Instance, "RSQUIT", "o", 1), Creator(Callback), Utils(Util)
+CommandRSQuit::CommandRSQuit (Module* Creator, SpanningTreeUtilities* Util)
+       : Command(Creator, "RSQUIT", 1), Utils(Util)
 {
-       this->source = "m_spanningtree.so";
+       flags_needed = 'o';
        syntax = "<target-server-mask> [reason]";
 }
 
@@ -63,13 +62,17 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use
                        sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
                        ServerInstance->SE->DelFd(sock);
                        sock->Close();
-                       return CMD_LOCALONLY;
                }
        }
 
        return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandRSQuit::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+       return ROUTE_UNICAST(parameters[0]);
+}
+
 // XXX use protocol interface instead of rolling our own :)
 void CommandRSQuit::NoticeUser(User* user, const std::string &msg)
 {
@@ -79,7 +82,7 @@ void CommandRSQuit::NoticeUser(User* user, const std::string &msg)
        }
        else
        {
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back(user->nick);
                params.push_back("NOTICE "+ConvToStr(user->nick)+" :"+msg);
                Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", params, user->server);