ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 13:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a bug that could cause duplicate IP address assignment on networks if many new members join the controller at once.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-03-06 16:21:49 -08:00
parent 5e6a4e5f5e
commit 7ea7e1898a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/EmbeddedNetworkController.hpp
View File

@ -121,7 +121,6 @@ private:
Mutex _threads_m;
// Gathers a bunch of statistics about members of a network, IP assignments, etc. that we need in various places
// This does lock _networkMemberCache_m
struct _NetworkMemberInfo
{
_NetworkMemberInfo() : authorizedMemberCount(0),activeMemberCount(0),totalMemberCount(0),mostRecentDeauthTime(0) {}
@ -136,6 +135,11 @@ private:
std::map<uint64_t,_NetworkMemberInfo> _nmiCache;
Mutex _nmiCache_m;
void _getNetworkMemberInfo(uint64_t now,uint64_t nwid,_NetworkMemberInfo &nmi);
inline void _clearNetworkMemberInfoCache(const uint64_t nwid)
{
Mutex::Lock _l(_nmiCache_m);
_nmiCache.erase(nwid);
}
void _pushMemberUpdate(uint64_t now,uint64_t nwid,const nlohmann::json &member);