gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix (1) a deadlock bug and (2) a bug that prevented distributed rendezvous messages from being sent.

Browse Source
This commit is contained in:
Adam Ierymenko
2015-11-09 13:39:06 -08:00
parent 73e2c6e511
commit 47424df417
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
node/Cluster.cpp
View File

@@ -395,6 +395,7 @@ void Cluster::sendViaCluster(const Address &fromPeerAddress,const Address &toPee
mostRecentTs = rpe->second; mostRecentTs = rpe->second;
mostRecentMemberId = rpe->first.second; mostRecentMemberId = rpe->first.second;
} }
++rpe;
} }
} }

1
node/Switch.cpp
View File

@@ -720,6 +720,7 @@ void Switch::_handleRemotePacketHead(const InetAddress &localAddr,const InetAddr
Mutex::Lock _l(_lastUniteAttempt_m); Mutex::Lock _l(_lastUniteAttempt_m);
uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)]; uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)];
shouldUnite = ((now - luts) >= ZT_MIN_UNITE_INTERVAL); shouldUnite = ((now - luts) >= ZT_MIN_UNITE_INTERVAL);
if (shouldUnite)
luts = now; luts = now;
} }
RR->cluster->sendViaCluster(source,destination,packet->data(),packet->size(),shouldUnite); RR->cluster->sendViaCluster(source,destination,packet->data(),packet->size(),shouldUnite);