ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 22:07:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Keep attemting to upgrade direct path if path is not private to facilitate better use of LANs and backplane networks.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-09-14 20:56:50 -07:00
parent f8014413a3
commit 52916eebcf
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
node/Peer.cpp
View File

@ -194,8 +194,12 @@ void Peer::received(
} }
} }
} }
} else if (this->trustEstablished(now)) { }
// Send PUSH_DIRECT_PATHS if hops>0 (relayed) and we have a trust relationship (common network membership)
// If we are being relayed or if we're using a global address, send PUSH_DIRECT_PATHS.
// In the global address case we push only configured direct paths to accomplish
// fall-forward to local backplane networks over e.g. LAN or Amazon VPC.
if ( ((hops > 0)||(path->ipScope() == InetAddress::IP_SCOPE_GLOBAL)) && (this->trustEstablished(now)) ) {
if ((now - _lastDirectPathPushSent) >= ZT_DIRECT_PATH_PUSH_INTERVAL) { if ((now - _lastDirectPathPushSent) >= ZT_DIRECT_PATH_PUSH_INTERVAL) {
_lastDirectPathPushSent = now; _lastDirectPathPushSent = now;
@ -205,13 +209,15 @@ void Peer::received(
for(std::vector<InetAddress>::const_iterator i(dps.begin());i!=dps.end();++i) for(std::vector<InetAddress>::const_iterator i(dps.begin());i!=dps.end();++i)
pathsToPush.push_back(*i); pathsToPush.push_back(*i);
std::vector<InetAddress> sym(RR->sa->getSymmetricNatPredictions()); if (hops > 0) {
for(unsigned long i=0,added=0;i<sym.size();++i) { std::vector<InetAddress> sym(RR->sa->getSymmetricNatPredictions());
InetAddress tmp(sym[(unsigned long)RR->node->prng() % sym.size()]); for(unsigned long i=0,added=0;i<sym.size();++i) {
if (std::find(pathsToPush.begin(),pathsToPush.end(),tmp) == pathsToPush.end()) { InetAddress tmp(sym[(unsigned long)RR->node->prng() % sym.size()]);
pathsToPush.push_back(tmp); if (std::find(pathsToPush.begin(),pathsToPush.end(),tmp) == pathsToPush.end()) {
if (++added >= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) pathsToPush.push_back(tmp);
break; if (++added >= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY)
break;
}
} }
} }