X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fencap.cpp;h=566f15da88d0298ee49c1b2bceda14b7ea7603ee;hb=3fef0ed889eecb40b96a597924254560c81d4a09;hp=9770ec84ead0276bcbebb5a5a205b5fbc2453e32;hpb=18f75b32d5d4b456496e65c3d472567bc02e6e17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 9770ec84e..566f15da8 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -1,43 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "commands.h"
 
 /** ENCAP */
-void TreeSocket::Encap(User* who, parameterlist &params)
+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 (InspIRCd::Match(ServerInstance->Config->GetSID(), params[0]))
-		{
-			parameterlist plist(params.begin() + 2, params.end());
-			ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
-			// discard return value, ENCAP shall succeed even if the command does not exist
-		}
-		
-		params[params.size() - 1] = ":" + params[params.size() - 1];
+		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 (params[0].find('*') != std::string::npos)
-		{
-			Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
-		}
-		else
-			Utils->DoOneToOne(who->uuid, "ENCAP", params, params[0]);
+		if ((cmd) && (cmd->force_manual_route))
+			return CMD_FAILURE;
 	}
+	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]);
+}