Change allocation of InspIRCd::Parser to be physically part of the object containing it

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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 972a7fd20f35184802a5cd0fccec56ff4135931f..95f8f4e4a7da0ea4b7f7f6da73cfc7efda3185c7 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,61 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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 "xline.h"
-
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
+#include "inspircd.h"
 
+#include "commands.h"
 
-/** remote MOTD. leet, huh? */
-bool TreeSocket::Encap(const std::string &prefix, std::deque<std::string> &params)
+/** ENCAP */
+CmdResult CommandEncap::Handle(User* user, std::vector<std::string>& params)
 {
-       if (params.size() > 1)
+       if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
        {
-               if (Instance->MatchText(Instance->Config->GetSID(), params[0]))
-               {
-                       Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-                       event.Send(Instance);
-               }
-               else
-               {
-                       User* u = Instance->FindNick(params[0]);
+               parameterlist plist(params.begin() + 2, params.end());
+               Command* cmd = NULL;
+               ServerInstance->Parser.CallHandler(params[1], plist, user, &cmd);
+               // Discard return value, ENCAP shall succeed even if the command does not exist
 
-                       if (u && IS_LOCAL(u))
-                       {
-                               Event event((char*) &params, (Module*)this->Utils->Creator, "encap_received");
-                               event.Send(Instance);
-                       }
-
-                       return true;
-               }
-
-               if (params[0].find('*') != std::string::npos)
-               {
-                       User* u = Instance->FindNick(params[0]);
-                       if (u)
-                               Utils->DoOneToAllButSender(prefix, "ENCAP", params, u->server);
-                       else
-                               Utils->DoOneToAllButSender(prefix, "ENCAP", params, params[0]);
-               }
-               else
-                       Utils->DoOneToOne(prefix, "ENCAP", params, prefix);
+               if ((cmd) && (cmd->force_manual_route))
+                       return CMD_FAILURE;
        }
-       return true;
+       return CMD_SUCCESS;
 }
 
+RouteDescriptor CommandEncap::GetRouting(User* user, const std::vector<std::string>& params)
+{
+       if (params[0].find_first_of("*?") != std::string::npos)
+               return ROUTE_BROADCAST;
+       return ROUTE_UNICAST(params[0]);
+}