diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-01 15:48:52 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-01 15:48:52 -0700 |
| commit | faf7b81c0173149230bc562ecf09b488f03af02e (patch) | |
| tree | 19eb5621bd316298062c51b7ef3186021149d18b /controller | |
| parent | bcc67999023c06f97402b4eef70443b39e091e65 (diff) | |
| download | infinitytier-faf7b81c0173149230bc562ecf09b488f03af02e.tar.gz infinitytier-faf7b81c0173149230bc562ecf09b488f03af02e.zip | |
Send last requets time in status, and do not set physicalAddr unless we know one.
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 514e06d1..9ffc0ea2 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -1059,11 +1059,11 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( _db.eachId([this,&pong,&now,&first](uint64_t networkId,uint64_t nodeId) { char tmp[64]; auto ms = this->_memberStatus.find(_MemberStatusKey(networkId,nodeId)); - Utils::snprintf(tmp,sizeof(tmp),"%s\"%.16llx-%.10llx\":%s", + Utils::snprintf(tmp,sizeof(tmp),"%s\"%.16llx-%.10llx\":%llu", (first) ? "" : ",", (unsigned long long)networkId, (unsigned long long)nodeId, - ((ms != _memberStatus.end())&&(ms->second.online(now))) ? "true" : "false"); + (ms != _memberStatus.end()) ? (unsigned long long)ms->second.lastRequestTime : 0ULL); pong.append(tmp); first = false; }); @@ -1385,7 +1385,8 @@ void EmbeddedNetworkController::_request( if (fromAddr) ms.physicalAddr = fromAddr; - member["physicalAddr"] = ms.physicalAddr.toString(); + if (ms.physicalAddr) + member["physicalAddr"] = ms.physicalAddr.toString(); } } } else { |