void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevent deadlock

Browse source
This commit is contained in:
Grant Limberg 2023-05-03 16:26:09 -07:00
parent ff2a9c88f0
commit f548905db4
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/Peer.cpp
View file

@ -520,6 +520,7 @@ void Peer::performMultipathStateCheck(void *tPtr, int64_t now)
unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now) unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
{ {
unsigned int sent = 0; unsigned int sent = 0;
{
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
performMultipathStateCheck(tPtr, now); performMultipathStateCheck(tPtr, now);
@ -581,6 +582,7 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
} }
_alive_path_count = alive_path_count_tmp; _alive_path_count = alive_path_count_tmp;
_dead_path_count = dead_path_count_tmp; _dead_path_count = dead_path_count_tmp;
}
_peer_latency.Observe(latency(now)); _peer_latency.Observe(latency(now));
return sent; return sent;
} }