ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comment out some new deauth code

Browse Source
This commit is contained in:
Adam Ierymenko 2022-04-13 23:10:11 -04:00
parent 42a2afaef9
commit 58119598ae
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controller/EmbeddedNetworkController.cpp
View File

@ -1865,6 +1865,7 @@ void EmbeddedNetworkController::_startThreads()
const long hwc = std::max((long)std::thread::hardware_concurrency(),(long)1); const long hwc = std::max((long)std::thread::hardware_concurrency(),(long)1);
for(long t=0;t<hwc;++t) { for(long t=0;t<hwc;++t) {
_threads.emplace_back([this]() { _threads.emplace_back([this]() {
std::vector< std::pair<uint64_t, uint64_t> > expired;
for(;;) { for(;;) {
_RQEntry *qe = (_RQEntry *)0; _RQEntry *qe = (_RQEntry *)0;
auto timedWaitResult = _queue.get(qe, 1000); auto timedWaitResult = _queue.get(qe, 1000);
@ -1883,12 +1884,12 @@ void EmbeddedNetworkController::_startThreads()
} }
} }
std::vector< std::pair<uint64_t, uint64_t> > expired; expired.clear();
int64_t now = OSUtils::now(); int64_t now = OSUtils::now();
{ {
std::lock_guard<std::mutex> l(_expiringSoon_l); std::lock_guard<std::mutex> l(_expiringSoon_l);
for(auto s=_expiringSoon.begin();s!=_expiringSoon.end();) { for(auto s=_expiringSoon.begin();s!=_expiringSoon.end();) {
int64_t when = s->first; const int64_t when = s->first;
if (when <= now) { if (when <= now) {
// Remove expired entries and if they are still correct as per the network status, deauth them. // Remove expired entries and if they are still correct as per the network status, deauth them.
std::lock_guard<std::mutex> l(_memberStatus_l); std::lock_guard<std::mutex> l(_memberStatus_l);
@ -1928,9 +1929,11 @@ void EmbeddedNetworkController::_startThreads()
} }
*/ */
/*
for(auto e=expired.begin();e!=expired.end();++e) { for(auto e=expired.begin();e!=expired.end();++e) {
onNetworkMemberDeauthorize(nullptr, e->first, e->second); onNetworkMemberDeauthorize(nullptr, e->first, e->second);
} }
*/
} }
}); });
} }