diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-09 15:45:26 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-08-09 15:45:26 -0700 |
| commit | e1310a764a39d0ed1f29f213c6e75c4e2d7a8aba (patch) | |
| tree | 8d7ba50fe474967fef0fe64ab52928e45746b411 /node/Peer.cpp | |
| parent | dbf3e6c3c9214d1b584da18f82743aa7c301ad3e (diff) | |
| download | infinitytier-e1310a764a39d0ed1f29f213c6e75c4e2d7a8aba.tar.gz infinitytier-e1310a764a39d0ed1f29f213c6e75c4e2d7a8aba.zip | |
More cleanup and removal of cruft due to obsolete network-specific relays (will be replaced with federation stuff).
Diffstat (limited to 'node/Peer.cpp')
| -rw-r--r-- | node/Peer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp index 89dce570..77e1d0b5 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -241,7 +241,7 @@ bool Peer::doPingAndKeepalive(uint64_t now,int inetAddressFamily) return false; } -bool Peer::pushDirectPaths(const InetAddress &localAddr,const InetAddress &toAddress,uint64_t now,bool force,bool includePrivatePaths) +bool Peer::pushDirectPaths(const InetAddress &localAddr,const InetAddress &toAddress,uint64_t now,bool force) { #ifdef ZT_ENABLE_CLUSTER // Cluster mode disables normal PUSH_DIRECT_PATHS in favor of cluster-based peer redirection @@ -258,10 +258,8 @@ bool Peer::pushDirectPaths(const InetAddress &localAddr,const InetAddress &toAdd std::vector<InetAddress> pathsToPush; std::vector<InetAddress> dps(RR->node->directPaths()); - for(std::vector<InetAddress>::const_iterator i(dps.begin());i!=dps.end();++i) { - if ((includePrivatePaths)||(i->ipScope() == InetAddress::IP_SCOPE_GLOBAL)) - pathsToPush.push_back(*i); - } + for(std::vector<InetAddress>::const_iterator i(dps.begin());i!=dps.end();++i) + pathsToPush.push_back(*i); std::vector<InetAddress> sym(RR->sa->getSymmetricNatPredictions()); for(unsigned long i=0,added=0;i<sym.size();++i) { |