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

Tighten a few timings.

Browse source
This commit is contained in:
Adam Ierymenko 2017-08-23 14:00:08 -07:00
parent 64758c46b6
commit 9cfc109527
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/Constants.hpp
View file

@ -226,12 +226,12 @@
/** /**
* Delay between WHOIS retries in ms * Delay between WHOIS retries in ms
*/ */
#define ZT_WHOIS_RETRY_DELAY 1000 #define ZT_WHOIS_RETRY_DELAY 500
/** /**
* Maximum identity WHOIS retries (each attempt tries consulting a different peer) * Maximum identity WHOIS retries (each attempt tries consulting a different peer)
*/ */
#define ZT_MAX_WHOIS_RETRIES 4 #define ZT_MAX_WHOIS_RETRIES 5
/** /**
* Transmit queue entry timeout * Transmit queue entry timeout

4
node/Switch.cpp
View file

@ -630,9 +630,9 @@ unsigned long Switch::doTimerTasks(void *tPtr,uint64_t now)
{ // Time out TX queue packets that never got WHOIS lookups or other info. { // Time out TX queue packets that never got WHOIS lookups or other info.
Mutex::Lock _l(_txQueue_m); Mutex::Lock _l(_txQueue_m);
for(std::list< TXQueueEntry >::iterator txi(_txQueue.begin());txi!=_txQueue.end();) { for(std::list< TXQueueEntry >::iterator txi(_txQueue.begin());txi!=_txQueue.end();) {
if (_trySend(tPtr,txi->packet,txi->encrypt)) if (_trySend(tPtr,txi->packet,txi->encrypt)) {
_txQueue.erase(txi++); _txQueue.erase(txi++);
else if ((now - txi->creationTime) > ZT_TRANSMIT_QUEUE_TIMEOUT) { } else if ((now - txi->creationTime) > ZT_TRANSMIT_QUEUE_TIMEOUT) {
RR->t->txTimedOut(tPtr,txi->dest); RR->t->txTimedOut(tPtr,txi->dest);
_txQueue.erase(txi++); _txQueue.erase(txi++);
} else ++txi; } else ++txi;