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

Fix pointer bug.

Browse source
This commit is contained in:
Adam Ierymenko 2017-08-23 16:55:22 -07:00
parent 6ee201865b
commit 180049a277
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
node/Switch.cpp
View file

@ -620,8 +620,7 @@ unsigned long Switch::doTimerTasks(void *tPtr,uint64_t now)
_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++);
++txi;
} else if (!RR->topology->getPeer(tPtr,txi->dest)) { } else if (!RR->topology->getPeer(tPtr,txi->dest)) {
requestWhois(tPtr,now,txi->dest); requestWhois(tPtr,now,txi->dest);
++txi; ++txi;

2
node/Switch.hpp
View file

@ -144,7 +144,7 @@ private:
const RuntimeEnvironment *const RR; const RuntimeEnvironment *const RR;
uint64_t _lastBeaconResponse; uint64_t _lastBeaconResponse;
uint64_t _lastCheckedQueues; volatile uint64_t _lastCheckedQueues;
// Time we last sent a WHOIS request for each address // Time we last sent a WHOIS request for each address
Hashtable< Address,uint64_t > _lastSentWhoisRequest; Hashtable< Address,uint64_t > _lastSentWhoisRequest;