...because every now and again, i have to do a massive commit.

[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 9e77c21fe087d1b1147356e8153095dee02ba8b9..460f8567420c815ad9d19dfc8beba431c57b5f3d 100644 (file)
--- a/src/modules/m_spanningtree/rconnect.cpp
+++ b/src/modules/m_spanningtree/rconnect.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-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,52 +12,51 @@
  */
 
 #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 "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/rconnect.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "commands.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h 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 */
-
-cmd_rconnect::cmd_rconnect (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>";
 }
 
-CmdResult cmd_rconnect::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRConnect::Handle (const std::vector<std::string>& parameters, User *user)
 {
        if (IS_LOCAL(user))
        {
                if (!Utils->FindServerMask(parameters[0]))
                {
-                       user->WriteServ("NOTICE %s :*** RCONNECT: Server \002%s\002 isn't connected to the network!", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** RCONNECT: Server \002%s\002 isn't connected to the network!", user->nick.c_str(), parameters[0].c_str());
                        return CMD_FAILURE;
                }
-               user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick,parameters[0],parameters[1]);
+               user->WriteServ("NOTICE %s :*** RCONNECT: Sending remote connect to \002%s\002 to connect server \002%s\002.",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str());
        }
 
        /* Is this aimed at our server? */
-       if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameters[0]))
+       if (InspIRCd::Match(ServerInstance->Config->ServerName,parameters[0]))
        {
                /* Yes, initiate the given connect */
-               ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick,parameters[0],parameters[1]);
-               const char* para[1];
-               para[0] = parameters[1];
-               std::string original_command = std::string("CONNECT ") + parameters[1];
-               Creator->OnPreCommand("CONNECT", para, 1, user, true, original_command);
+               ServerInstance->SNO->WriteToSnoMask('l',"Remote CONNECT from %s matching \002%s\002, connecting server \002%s\002",user->nick.c_str(),parameters[0].c_str(),parameters[1].c_str());
+               std::vector<std::string> para;
+               para.push_back(parameters[1]);
+               std::string cmd("CONNECT");
+               std::string original_command = cmd + " " + parameters[1];
+               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]);
+}