diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-04 08:39:22 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-04 08:39:22 -0700 |
| commit | b48a70db2e2639bef81941b17c4f3268c41d2a9f (patch) | |
| tree | c0b58909b46c43d9733cbbd425f2864b86670bcf /controller | |
| parent | cd050b3423ede9c21e53db3a47cdad7ccf5bcb65 (diff) | |
| parent | eddbc7e757f26e59d6eeab7e31e31eb6c47dcf20 (diff) | |
| download | infinitytier-b48a70db2e2639bef81941b17c4f3268c41d2a9f.tar.gz infinitytier-b48a70db2e2639bef81941b17c4f3268c41d2a9f.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 841060d6..b7b740a0 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -665,7 +665,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( // Member is being de-authorized, so spray Revocation objects to all online members if (!newAuth) { _clearNetworkMemberInfoCache(nwid); - Revocation rev(_node->prng(),nwid,0,now,ZT_REVOCATION_FLAG_FAST_PROPAGATE,Address(address),Revocation::CREDENTIAL_TYPE_COM); + Revocation rev((uint32_t)_node->prng(),nwid,0,now,ZT_REVOCATION_FLAG_FAST_PROPAGATE,Address(address),Revocation::CREDENTIAL_TYPE_COM); rev.sign(_signingId); Mutex::Lock _l(_lastRequestTime_m); for(std::map< std::pair<uint64_t,uint64_t>,uint64_t >::iterator i(_lastRequestTime.begin());i!=_lastRequestTime.end();++i) { |