X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpostcommand.cpp;h=64ca729779249cd2a44e8bb8fc80db9119719d71;hb=b9e11915a976daaf790ebc763aff56e19fd49e0f;hp=9f90f34581d9d479b48083f2ed8b885973edb595;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/postcommand.cpp b/src/modules/m_spanningtree/postcommand.cpp
index 9f90f3458..64ca72977 100644
--- a/src/modules/m_spanningtree/postcommand.cpp
+++ b/src/modules/m_spanningtree/postcommand.cpp
@@ -39,23 +39,33 @@ 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;
+			// Assume the command handler already validated routing.serverdest and have only returned success if the target is something that the
+			// user executing the command is allowed to look up e.g. target is not an uuid if user is local.
+			sdest = FindRouteTarget(routing.serverdest);
+			if (!sdest)
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Trying to route %s%s to nonexistent 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
 	{
@@ -81,7 +91,7 @@ void SpanningTreeUtilities::RouteCommand(TreeServer* origin, CommandBase* thiscm
 		if (ServerInstance->Modes->FindPrefix(dest[0]))
 		{
 			pfx = dest[0];
-			dest = dest.substr(1);
+			dest.erase(dest.begin());
 		}
 		if (dest[0] == '#')
 		{
@@ -115,8 +125,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);
 	}
 }