X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=3f5d427e169a7ca90b68e82ae0648217f191c825;hb=b111d5098fe1ee306d2718c82c72f969db9d183d;hp=6afe8e2c9c1fe808adf9176a7c26037b0a8a1206;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 6afe8e2c9..3f5d427e1 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,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);
@@ -52,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)
 	{
@@ -73,7 +73,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, const std::string &
 		TreeServer* sdest = FindServer(routing.serverdest);
 		if (!sdest)
 		{
-			ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Trying to route ENCAP to nonexistant server %s",
+			ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Trying to route ENCAP to nonexistent server %s",
 				routing.serverdest.c_str());
 			return;
 		}