From 91940cbcf52c6b09f343e365632b8a1701732099 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 2 Aug 2016 14:40:26 -0700
Subject: Kill network preferred relays -- this feature is gone (and was seldom
 used anyway) in favor of federation.

---
 node/Topology.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'node/Topology.cpp')

diff --git a/node/Topology.cpp b/node/Topology.cpp
index 6e96f2eb..9b434732 100644
--- a/node/Topology.cpp
+++ b/node/Topology.cpp
@@ -281,15 +281,7 @@ SharedPtr<Peer> Topology::getBestRoot(const Address *avoid,unsigned int avoidCou
 
 bool Topology::isUpstream(const Identity &id) const
 {
-	if (isRoot(id))
-		return true;
-	std::vector< SharedPtr<Network> > nws(RR->node->allNetworks());
-	for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) {
-		if ((*nw)->config().isRelay(id.address())) {
-			return true;
-		}
-	}
-	return false;
+	return isRoot(id);
 }
 
 bool Topology::worldUpdateIfValid(const World &newWorld)
-- 
cgit v1.2.3