diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-02 14:35:38 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-02 14:35:38 -0800 |
| commit | a109d341ef72149dad5eae0b616a1f47d24487f9 (patch) | |
| tree | 167d79e8c9b840e9c302082f3a6c1c4ac34ce7ac | |
| parent | 87b53d67c51fabfd208d8999be14984517d869a7 (diff) | |
| download | infinitytier-a109d341ef72149dad5eae0b616a1f47d24487f9.tar.gz infinitytier-a109d341ef72149dad5eae0b616a1f47d24487f9.zip | |
Send timestamp with new circuit test response.
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 6 | ||||
| -rw-r--r-- | controller/EmbeddedNetworkController.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 7915765b..b7360220 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -782,8 +782,8 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( return 500; } - char json[1024]; - Utils::snprintf(json,sizeof(json),"{\"testId\":\"%.16llx\"}",test->testId); + char json[512]; + Utils::snprintf(json,sizeof(json),"{\"testId\":\"%.16llx\",\"timestamp\":%llu}",test->testId,test->timestamp); responseBody = json; responseContentType = "application/json"; @@ -1808,7 +1808,7 @@ void EmbeddedNetworkController::_pushMemberUpdate(uint64_t now,uint64_t nwid,con bool online; { Mutex::Lock _l(_lastRequestTime_m); - std::map<std::pair<uint64_t,uint64_t>,uint64_t>::iterator lrt(_lastRequestTime.find(std::pair<uint64_t,uint64_t>(id.address().toInt(),nwid))); + std::map< std::pair<uint64_t,uint64_t>,uint64_t >::iterator lrt(_lastRequestTime.find(std::pair<uint64_t,uint64_t>(id.address().toInt(),nwid))); online = ( (lrt != _lastRequestTime.end()) && ((now - lrt->second) < ZT_NETWORK_AUTOCONF_DELAY) ); } if (online) { diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp index ab7cdd53..7163c004 100644 --- a/controller/EmbeddedNetworkController.hpp +++ b/controller/EmbeddedNetworkController.hpp @@ -204,7 +204,7 @@ private: std::list< ZT_CircuitTest > _tests; Mutex _tests_m; - std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime; + std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime; // last request time by <address,networkId> Mutex _lastRequestTime_m; }; |