weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1104 from Heap-Hop/master

Browse Source 
fix: android build & CONFIG deadlock
This commit is contained in:
RustDesk
2022-07-29 18:59:34 +08:00
committed by GitHub
parent 02174bccdf 2fbcbc6543
commit 06a4eaed10
7 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hbb_common/src/config.rs
View File

@@ -596,6 +596,18 @@ impl Config {
config.store();
}
// * Manually make sure no gen_keypair more than once
// for uuid, avoid deadlock
pub fn get_key_pair_without_lock() -> (Vec<u8>, Vec<u8>) {
let mut config = Config::load_::<Config>("");
if config.key_pair.0.is_empty() {
let (pk, sk) = sign::gen_keypair();
config.key_pair = (sk.0.to_vec(), pk.0.into());
Config::store_(&config, "");
}
config.key_pair.clone()
}
pub fn get_key_pair() -> (Vec<u8>, Vec<u8>) {
// lock here to make sure no gen_keypair more than once
let mut config = CONFIG.write().unwrap();