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

Fix small issue preventing pongs if there are never seen members.

Browse source
This commit is contained in:
Adam Ierymenko 2017-05-02 10:34:33 -07:00
parent faf7b81c01
commit 132643cd4a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controller/EmbeddedNetworkController.cpp
View file

@ -1058,12 +1058,15 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
Mutex::Lock _l(_memberStatus_m); Mutex::Lock _l(_memberStatus_m);
_db.eachId([this,&pong,&now,&first](uint64_t networkId,uint64_t nodeId) { _db.eachId([this,&pong,&now,&first](uint64_t networkId,uint64_t nodeId) {
char tmp[64]; char tmp[64];
uint64_t lrt = 0ULL;
auto ms = this->_memberStatus.find(_MemberStatusKey(networkId,nodeId)); auto ms = this->_memberStatus.find(_MemberStatusKey(networkId,nodeId));
if (ms != _memberStatus.end())
lrt = ms->second.lastRequestTime;
Utils::snprintf(tmp,sizeof(tmp),"%s\"%.16llx-%.10llx\":%llu", Utils::snprintf(tmp,sizeof(tmp),"%s\"%.16llx-%.10llx\":%llu",
(first) ? "" : ",", (first) ? "" : ",",
(unsigned long long)networkId, (unsigned long long)networkId,
(unsigned long long)nodeId, (unsigned long long)nodeId,
(ms != _memberStatus.end()) ? (unsigned long long)ms->second.lastRequestTime : 0ULL); (unsigned long long)lrt);
pong.append(tmp); pong.append(tmp);
first = false; first = false;
}); });