X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=b91435eeece4550a93c91e71a3ce682c665faec6;hb=645f7e18c64a6628ede880dc69bf8825ba93b375;hp=d8cb5081dc55bc2a4cf22e7740ea09ffe263ba18;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index d8cb5081d..b91435eee 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 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/>.
  */
 
+
 /* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
@@ -24,7 +31,7 @@
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
 
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, User *user, CmdResult result, const std::string &original_line)
+void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, LocalUser *user, CmdResult result, const std::string &original_line)
 {
 	if (result == CMD_SUCCESS)
 		Utils->RouteCommand(NULL, command, parameters, user);
@@ -32,10 +39,10 @@ void ModuleSpanningTree::OnPostCommand(const std::string &command, const std::ve
 
 void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &command, const parameterlist& parameters, User *user)
 {
-	if (!ServerInstance->IsValidModuleCommand(command, parameters.size(), user))
+	if (!ServerInstance->Parser->IsValidCommand(command, parameters.size(), user))
 		return;
 
-	/* We know it's non-null because IsValidModuleCommand returned true */
+	/* We know it's non-null because IsValidCommand returned true */
 	Command* thiscmd = ServerInstance->Parser->GetHandler(command);
 
 	RouteDescriptor routing = thiscmd->GetRouting(user, parameters);
@@ -45,15 +52,15 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 
 	if (routing.type == ROUTE_TYPE_LOCALONLY)
 	{
-		Module* srcmodule = thiscmd->creator;
-		Version ver = srcmodule->GetVersion();
+		/* Broadcast when it's a core command with the default route descriptor and the source is a
+		 * remote user or a remote server
+		 */
 
-		if ((ver.Flags & VF_CORE) && !IS_LOCAL(user))
-			routing = ROUTE_BROADCAST;
-		else
-			return;
-		if (IS_SERVER(user) && user != ServerInstance->FakeClient)
+		Version ver = thiscmd->creator->GetVersion();
+		if ((!(ver.Flags & VF_CORE)) || (IS_LOCAL(user)) || (IS_SERVER(user) == ServerInstance->FakeClient))
 			return;
+
+		routing = ROUTE_BROADCAST;
 	}
 	else if (routing.type == ROUTE_TYPE_OPT_BCAST)
 	{
@@ -66,7 +73,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 		TreeServer* sdest = FindServer(routing.serverdest);
 		if (!sdest)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",ERROR,"Trying to route ENCAP to nonexistant server %s",
+			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Trying to route ENCAP to nonexistant server %s",
 				routing.serverdest.c_str());
 			return;
 		}
@@ -79,9 +86,9 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 		Module* srcmodule = thiscmd->creator;
 		Version ver = srcmodule->GetVersion();
 
-		if (!(ver.Flags & (VF_COMMON | VF_CORE)))
+		if (!(ver.Flags & (VF_COMMON | VF_CORE)) && srcmodule != Creator)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",ERROR,"Routed command %s from non-VF_COMMON module %s",
+			ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Routed command %s from non-VF_COMMON module %s",
 				command.c_str(), srcmodule->ModuleSourceFile.c_str());
 			return;
 		}