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

Cancel NAT-t attempts if peer is no longer "alive"

Browse source
This commit is contained in:
Adam Ierymenko 2015-07-28 12:18:59 -07:00
parent 5986d83738
commit 21e6850722
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/Switch.cpp
View file

@ -452,8 +452,8 @@ unsigned long Switch::doTimerTasks(uint64_t now)
Mutex::Lock _l(_contactQueue_m); Mutex::Lock _l(_contactQueue_m);
for(std::list<ContactQueueEntry>::iterator qi(_contactQueue.begin());qi!=_contactQueue.end();) { for(std::list<ContactQueueEntry>::iterator qi(_contactQueue.begin());qi!=_contactQueue.end();) {
if (now >= qi->fireAtTime) { if (now >= qi->fireAtTime) {
if (qi->peer->hasActiveDirectPath(now)) { if ((!qi->peer->alive(now))||(qi->peer->hasActiveDirectPath(now))) {
// We've successfully NAT-t'd, so cancel attempt // Cancel attempt if we've already connected or peer is no longer "alive"
_contactQueue.erase(qi++); _contactQueue.erase(qi++);
continue; continue;
} else { } else {