void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clarify logic in pinging, and prevent roots from pinging "down."

Browse source
This commit is contained in:
Adam Ierymenko 2015-10-23 14:05:12 -07:00
parent e6a63f5547
commit e9648a6cdf
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
node/Node.cpp
View file

@ -211,8 +211,15 @@ public:
} }
} }
// If this is a network preferred relay, also always ping and if a stable endpoint is specified use that if not alive
if (!upstream) { if (!upstream) {
// If I am a root server, only ping other root servers -- roots don't ping "down"
// since that would just be a waste of bandwidth and could potentially cause route
// flapping in Cluster mode.
if (RR->topology->amRoot())
return;
// Check for network preferred relays, also considered 'upstream' and thus always
// pinged to keep links up. If they have stable addresses we will try them there.
for(std::vector< std::pair<Address,InetAddress> >::const_iterator r(_relays.begin());r!=_relays.end();++r) { for(std::vector< std::pair<Address,InetAddress> >::const_iterator r(_relays.begin());r!=_relays.end();++r) {
if (r->first == p->address()) { if (r->first == p->address()) {
if (r->second.ss_family == AF_INET) if (r->second.ss_family == AF_INET)
@ -229,18 +236,22 @@ public:
// "Upstream" devices are roots and relays and get special treatment -- they stay alive // "Upstream" devices are roots and relays and get special treatment -- they stay alive
// forever and we try to keep (if available) both IPv4 and IPv6 channels open to them. // forever and we try to keep (if available) both IPv4 and IPv6 channels open to them.
bool needToContactIndirect = true; bool needToContactIndirect = true;
if (!p->doPingAndKeepalive(RR,_now,AF_INET)) { if (p->doPingAndKeepalive(RR,_now,AF_INET)) {
needToContactIndirect = false;
} else {
if (stableEndpoint4) { if (stableEndpoint4) {
needToContactIndirect = false; needToContactIndirect = false;
p->attemptToContactAt(RR,InetAddress(),stableEndpoint4,_now); p->attemptToContactAt(RR,InetAddress(),stableEndpoint4,_now);
} }
} else needToContactIndirect = false; }
if (!p->doPingAndKeepalive(RR,_now,AF_INET6)) { if (p->doPingAndKeepalive(RR,_now,AF_INET6)) {
needToContactIndirect = false;
} else {
if (stableEndpoint6) { if (stableEndpoint6) {
needToContactIndirect = false; needToContactIndirect = false;
p->attemptToContactAt(RR,InetAddress(),stableEndpoint6,_now); p->attemptToContactAt(RR,InetAddress(),stableEndpoint6,_now);
} }
} else needToContactIndirect = false; }
if (needToContactIndirect) { if (needToContactIndirect) {
// If this is an upstream and we have no stable endpoint for either IPv4 or IPv6, // If this is an upstream and we have no stable endpoint for either IPv4 or IPv6,