Introduce Server class

- Replaces std::string server in User
- Replaces InspIRCd::ULine() and SilentULine()

1 files changed, 3 insertions, 10 deletions

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index b66595bd1..f97ce5539 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -229,7 +229,6 @@ void TreeSocket::ProcessLine(std::string &line)
 void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params)
 {
 	User* who = ServerInstance->FindUUID(prefix);
-	std::string direction;
 
 	if (!who)
 	{
@@ -269,10 +268,6 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 		}
 	}
 
-	// Make sure prefix is still good
-	direction = who->server;
-	prefix = who->uuid;
-
 	/*
 	 * Check for fake direction here, and drop any instances that are found.
 	 * What is fake direction? Imagine the following server setup:
@@ -289,12 +284,10 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 	 * a valid SID or a valid UUID, so that invalid UUID or SID never makes it
 	 * to the higher level functions. -- B
 	 */
-	TreeServer* route_back_again = Utils->BestRouteTo(direction);
-	if ((!route_back_again) || (route_back_again->GetSocket() != this))
+	TreeServer* route_back_again = TreeServer::Get(who)->GetRoute();
+	if (route_back_again->GetSocket() != this)
 	{
-		if (route_back_again)
-			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'",
-				prefix.c_str(),linkID.c_str());
+		ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'", prefix.c_str(), linkID.c_str());
 		return;
 	}