Merge pull request #1359 from genius3000/insp20+sasl_no_server

[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 cd671350daf4ebd71af68d76b325c4c766505d57..027ae02ab78dc45dab25cf4496c44a49148b75d9 100644 (file)
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -1,34 +1,37 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.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"
 
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h m_spanningtree/rsquit.h */
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "commands.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]";
 }
 
@@ -60,16 +63,19 @@ CmdResult CommandRSQuit::Handle (const std::vector<std::string>& parameters, Use
                {
                        const char *reason = parameters.size() == 2 ? parameters[1].c_str() : "No reason";
                        ServerInstance->SNO->WriteToSnoMask('l',"RSQUIT: Server \002%s\002 removed from network by %s (%s)", parameters[0].c_str(), user->nick.c_str(), reason);
-                       sock->Squit(server_target, std::string("Server quit by ") + user->GetFullRealHost() + " (" + reason + ")");
-                       ServerInstance->SE->DelFd(sock);
+                       sock->Squit(server_target, "Server quit by " + user->GetFullRealHost() + " (" + reason + ")");
                        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 +85,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);