From 6c5ac89f35d49833d7075c1449b2d82ddf7926dc Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Tue, 29 Mar 2016 12:45:37 +0200
Subject: m_spanningtree Remove unused SpanningTreeUtilities::DoOneToOne()
 overload accepting a string

---
 src/modules/m_spanningtree/utils.cpp | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/modules/m_spanningtree/utils.cpp')

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index bbda2634d..71855305e 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -191,16 +191,6 @@ void SpanningTreeUtilities::DoOneToAllButSender(const CmdBuilder& params, TreeSe
 	}
 }
 
-bool SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, const std::string& target)
-{
-	TreeServer* Route = this->BestRouteTo(target);
-	if (!Route)
-		return false;
-
-	DoOneToOne(params, Route);
-	return true;
-}
-
 void SpanningTreeUtilities::DoOneToOne(const CmdBuilder& params, Server* server)
 {
 	TreeServer* ts = static_cast<TreeServer*>(server);
-- 
cgit v1.3.1-10-gc9f91


From 610a74ecea1d4b70f0c7eb3de04b8f7ff27e1fed Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Tue, 29 Mar 2016 12:46:12 +0200
Subject: m_spanningtree Remove unused SpanningTreeUtilities::BestRouteTo()

---
 src/modules/m_spanningtree/utils.cpp | 26 --------------------------
 src/modules/m_spanningtree/utils.h   |  4 ----
 2 files changed, 30 deletions(-)

(limited to 'src/modules/m_spanningtree/utils.cpp')

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 71855305e..05b77bb62 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -67,32 +67,6 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 	}
 }
 
-/** Returns the locally connected server we must route a
- * message through to reach server 'ServerName'. This
- * only applies to one-to-one and not one-to-many routing.
- * See the comments for the constructor of TreeServer
- * for more details.
- */
-TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName)
-{
-	TreeServer* Found = FindServer(ServerName);
-	if (Found)
-	{
-		return Found->GetRoute();
-	}
-	else
-	{
-		// Cheat a bit. This allows for (better) working versions of routing commands with nick based prefixes, without hassle
-		User *u = ServerInstance->FindNick(ServerName);
-		if (u)
-		{
-			return TreeServer::Get(u)->GetRoute();
-		}
-
-		return NULL;
-	}
-}
-
 /** Find the first server matching a given glob mask.
  * We iterate over the list and match each one until we get a hit.
  */
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 3c54e93ac..6d0d094e7 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -148,10 +148,6 @@ class SpanningTreeUtilities : public classbase
 	 */
 	TreeServer* FindServerID(const std::string &id);
 
-	/** Find a route to a server by name
-	 */
-	TreeServer* BestRouteTo(const std::string &ServerName);
-
 	/** Find a server by glob mask
 	 */
 	TreeServer* FindServerMask(const std::string &ServerName);
-- 
cgit v1.3.1-10-gc9f91


From ea258053f694ff17980e2f39ea182f3a2de9ba5b Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Tue, 29 Mar 2016 12:49:25 +0200
Subject: m_spanningtree Add SpanningTreeUtilities::FindRouteTarget()

---
 src/modules/m_spanningtree/utils.cpp | 13 +++++++++++++
 src/modules/m_spanningtree/utils.h   |  5 +++++
 2 files changed, 18 insertions(+)

(limited to 'src/modules/m_spanningtree/utils.cpp')

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 05b77bb62..6de47de94 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -89,6 +89,19 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
 		return NULL;
 }
 
+TreeServer* SpanningTreeUtilities::FindRouteTarget(const std::string& target)
+{
+	TreeServer* const server = FindServer(target);
+	if (server)
+		return server;
+
+	User* const user = ServerInstance->FindNick(target);
+	if (user)
+		return TreeServer::Get(user);
+
+	return NULL;
+}
+
 SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C)
 	: Creator(C), TreeRoot(NULL)
 	, PingFreq(60) // XXX: TreeServer constructor reads this and TreeRoot is created before the config is read, so init it to something (value doesn't matter) to avoid a valgrind warning in TimerManager on unload
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 6d0d094e7..a2f7212f6 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -148,6 +148,11 @@ class SpanningTreeUtilities : public classbase
 	 */
 	TreeServer* FindServerID(const std::string &id);
 
+	/** Find a server based on a target string.
+	 * @param target Target string where a command should be routed to. May be a server name, a sid, a nickname or a uuid.
+	 */
+	TreeServer* FindRouteTarget(const std::string& target);
+
 	/** Find a server by glob mask
 	 */
 	TreeServer* FindServerMask(const std::string &ServerName);
-- 
cgit v1.3.1-10-gc9f91