diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-02 15:38:53 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-02 15:38:53 -0800 |
| commit | 7fbe2f7adf3575f3a21fc1ab3a5a2a036e18e6e2 (patch) | |
| tree | eb291bc9f2e053366f4f4c2ae1eb2a3e267482f1 /node/Switch.cpp | |
| parent | 60ce886605c0298fc22dbce48beb106a96bd35e2 (diff) | |
| download | infinitytier-7fbe2f7adf3575f3a21fc1ab3a5a2a036e18e6e2.tar.gz infinitytier-7fbe2f7adf3575f3a21fc1ab3a5a2a036e18e6e2.zip | |
Tweak some more timings for better reliability.
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 2f72f57a..120ce7a4 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -442,8 +442,8 @@ unsigned long Switch::doTimerTasks(uint64_t now) Mutex::Lock _l(_contactQueue_m); for(std::list<ContactQueueEntry>::iterator qi(_contactQueue.begin());qi!=_contactQueue.end();) { if (now >= qi->fireAtTime) { - if ((!qi->peer->alive(now))||(qi->peer->hasActiveDirectPath(now))) { - // Cancel attempt if we've already connected or peer is no longer "alive" + if (qi->peer->hasActiveDirectPath(now)) { + // Cancel if connection has succeeded _contactQueue.erase(qi++); continue; } else { @@ -539,7 +539,7 @@ unsigned long Switch::doTimerTasks(uint64_t now) _LastUniteKey *k = (_LastUniteKey *)0; uint64_t *v = (uint64_t *)0; while (i.next(k,v)) { - if ((now - *v) >= (ZT_MIN_UNITE_INTERVAL * 16)) + if ((now - *v) >= (ZT_MIN_UNITE_INTERVAL * 8)) _lastUniteAttempt.erase(*k); } } |