X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=0695ce63230fcd6069f2f0ceb89195508948a6a3;hb=bc51c8e4da14f405d6d6220a4453a58ebde580c6;hp=57fbca6bc3835e97774b4282b5fb930b162285b8;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 57fbca6bc..0695ce632 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,23 +39,31 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 
 	const bool encap = ((routing.type == ROUTE_TYPE_OPT_BCAST) || (routing.type == ROUTE_TYPE_OPT_UCAST));
 	CmdBuilder params(user, encap ? "ENCAP" : command.c_str());
+	TreeServer* sdest = NULL;
 
 	if (routing.type == ROUTE_TYPE_OPT_BCAST)
 	{
 		params.push('*');
 		params.push_back(command);
 	}
-	else if (routing.type == ROUTE_TYPE_OPT_UCAST)
+	else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST)
 	{
-		TreeServer* sdest = FindServer(routing.serverdest);
+		sdest = static_cast<TreeServer*>(routing.server);
 		if (!sdest)
 		{
-			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route ENCAP to nonexistant server %s",
-				routing.serverdest.c_str());
-			return;
+			sdest = FindServer(routing.serverdest);
+			if (!sdest)
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route %s%s to nonexistant server %s", (encap ? "ENCAP " : ""), command.c_str(), routing.serverdest.c_str());
+				return;
+			}
+		}
+
+		if (encap)
+		{
+			params.push_back(sdest->GetID());
+			params.push_back(command);
 		}
-		params.push_back(sdest->GetID());
-		params.push_back(command);
 	}
 	else
 	{
@@ -100,9 +108,9 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 		{
 			// user target?
 			User* d = ServerInstance->FindNick(dest);
-			if (!d)
+			if (!d || IS_LOCAL(d))
 				return;
-			TreeServer* tsd = BestRouteTo(d->server);
+			TreeServer* tsd = TreeServer::Get(d)->GetRoute();
 			if (tsd == origin)
 				// huh? no routing stuff around in a circle, please.
 				return;
@@ -115,8 +123,6 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 	}
 	else if (routing.type == ROUTE_TYPE_UNICAST || routing.type == ROUTE_TYPE_OPT_UCAST)
 	{
-		if (origin && routing.serverdest == origin->GetName())
-			return;
-		params.Unicast(routing.serverdest);
+		params.Unicast(sdest->ServerUser);
 	}
 }