summaryrefslogtreecommitdiff
path: root/node/Topology.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-08-02 14:40:26 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-08-02 14:40:26 -0700
commit91940cbcf52c6b09f343e365632b8a1701732099 (patch)
tree7312b67871a97d8a1edf97501f3621606bb7ec84 /node/Topology.cpp
parent77bd8aacd1bb17cd9c2213ffb4dd455330e587e0 (diff)
downloadinfinitytier-91940cbcf52c6b09f343e365632b8a1701732099.tar.gz
infinitytier-91940cbcf52c6b09f343e365632b8a1701732099.zip
Kill network preferred relays -- this feature is gone (and was seldom used anyway) in favor of federation.
Diffstat (limited to 'node/Topology.cpp')
-rw-r--r--node/Topology.cpp10
1 files changed, 1 insertions, 9 deletions
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)