ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 15:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use max of core or most recent path desperation for pings.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-04-08 14:58:23 -07:00
parent 59af674e74
commit 40bfe37a19
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/Peer.cpp
View File

@ -191,14 +191,15 @@ void Peer::doPingAndKeepalive(const RuntimeEnvironment *RR,uint64_t now)
{ {
Path *const bestPath = getBestPath(now); Path *const bestPath = getBestPath(now);
if ((bestPath)&&(bestPath->active(now))) { if ((bestPath)&&(bestPath->active(now))) {
const unsigned int desp = std::max(RR->node->coreDesperation(),bestPath->lastReceiveDesperation());
if ((now - bestPath->lastReceived()) >= ZT_PEER_DIRECT_PING_DELAY) { if ((now - bestPath->lastReceived()) >= ZT_PEER_DIRECT_PING_DELAY) {
attemptToContactAt(RR,bestPath->address(),bestPath->desperation(now),now); attemptToContactAt(RR,bestPath->address(),desp,now);
bestPath->sent(now); bestPath->sent(now);
} else if ((now - bestPath->lastSend()) >= ZT_NAT_KEEPALIVE_DELAY) { } else if ((now - bestPath->lastSend()) >= ZT_NAT_KEEPALIVE_DELAY) {
// We only do keepalive if desperation is zero right now, since higher // We only do keepalive if desperation is zero right now, since higher
// desperation paths involve things like tunneling that do not need it. // desperation paths involve things like tunneling that do not need it.
if (bestPath->desperation() == 0) { if (desp == 0) {
RR->node->putPacket(_paths[p].address(),"",0,0); RR->node->putPacket(bestPath->address(),"",0,0);
bestPath->sent(now); bestPath->sent(now);
} }
} }
@ -261,7 +262,7 @@ void Peer::resetWithinScope(const RuntimeEnvironment *RR,InetAddress::IpScope sc
while (x < np) { while (x < np) {
if (_paths[x].address().ipScope() == scope) { if (_paths[x].address().ipScope() == scope) {
if (_paths[x].fixed()) { if (_paths[x].fixed()) {
attemptToContactAt(RR,_paths[x].address(),_paths[x].desperation(now),now); attemptToContactAt(RR,_paths[x].address(),_paths[x].lastReceiveDesperation(),now);
_paths[y++] = _paths[x]; // keep fixed paths _paths[y++] = _paths[x]; // keep fixed paths
} }
} else { } else {