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

Deauth expiring members right away.

Browse Source
This commit is contained in:
Adam Ierymenko
2021-07-26 23:45:18 -04:00
parent 0cf62d334d
commit 663e748b8d
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controller/EmbeddedNetworkController.cpp
View File

@ -1379,7 +1379,7 @@ void EmbeddedNetworkController::_request(
}
return;
} else if (authorized) {
_db.memberExpiring(authenticationExpiryTime, nwid, identity.address().toInt());
_db.memberWillExpire(authenticationExpiryTime, nwid, identity.address().toInt());
}
}
@ -1836,22 +1836,29 @@ void EmbeddedNetworkController::_startThreads()
}
}
auto expiringSoon = _db.membersExpiringSoon();
for(auto soon=expiringSoon.begin();soon!=expiringSoon.end();++soon) {
std::set< std::pair<uint64_t, uint64_t> > soon;
std::set< std::pair<uint64_t, uint64_t> > expired;
_db.membersExpiring(soon, expired);
for(auto s=soon.begin();s!=soon.end();++s) {
Identity identity;
Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> lastMetaData;
{
std::unique_lock<std::mutex> ll(_memberStatus_l);
auto ms = _memberStatus.find(_MemberStatusKey(soon->first, soon->second));
auto ms = _memberStatus.find(_MemberStatusKey(s->first, s->second));
if (ms != _memberStatus.end()) {
lastMetaData = ms->second.lastRequestMetaData;
identity = ms->second.identity;
}
}
if (identity) {
request(soon->first,InetAddress(),0,identity,lastMetaData);
request(s->first,InetAddress(),0,identity,lastMetaData);
}
}
for(auto e=expired.begin();e!=expired.end();++e) {
onNetworkMemberDeauthorize(nullptr, e->first, e->second);
}
}
});
}