github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-10 23:33:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix deadlock on sso network leave

Browse source
This commit is contained in:
Grant Limberg 2022-04-25 13:56:13 -07:00
parent f3b56d3d94
commit dac32f863e
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
zeroidc/src/lib.rs
View file

@ -311,7 +311,9 @@ impl ZeroIDC {
}
sleep(Duration::from_secs(1));
running = (*inner_local.lock().unwrap()).running;
{
running = (*inner_local.lock().unwrap()).running;
}
}
println!("thread done!")
@ -321,21 +323,16 @@ impl ZeroIDC {
pub fn stop(&mut self) {
let local = self.inner.clone();
if (*local.lock().unwrap()).running {
if let Some(u) = (*local.lock().unwrap()).oidc_thread.take() {
u.join().expect("join failed");
}
if self.is_running(){
(*local.lock().unwrap()).running = false;
}
}
pub fn is_running(&mut self) -> bool {
let local = Arc::clone(&self.inner);
let running = (*local.lock().unwrap()).running;
if (*local.lock().unwrap()).running {
true
} else {
false
}
running
}
pub fn get_exp_time(&mut self) -> u64 {