luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-06 23:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refine TUN_QUIT

Browse source
This commit is contained in:
ssrlive 2024-03-06 18:01:02 +08:00
parent 989406d00c
commit 7cb251c190
2 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/desktop_api.rs
View file

@ -74,11 +74,6 @@ pub unsafe extern "C" fn tun2proxy_with_name_run(
}, },
}; };
// release shutdown token before exit.
if let Ok(mut lock) = TUN_QUIT.lock() {
let _ = lock.take();
}
exit_code exit_code
} }
@ -150,8 +145,8 @@ pub async fn desktop_run_async(args: Args, shutdown_token: tokio_util::sync::Can
/// Shutdown the tun2proxy component. /// Shutdown the tun2proxy component.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn tun2proxy_with_name_stop() -> c_int { pub unsafe extern "C" fn tun2proxy_with_name_stop() -> c_int {
if let Ok(lock) = TUN_QUIT.lock() { if let Ok(mut lock) = TUN_QUIT.lock() {
if let Some(shutdown_token) = lock.as_ref() { if let Some(shutdown_token) = lock.take() {
shutdown_token.cancel(); shutdown_token.cancel();
return 0; return 0;
} }

22
src/mobile_api.rs
View file

@ -15,12 +15,16 @@ pub async fn desktop_run_async(_: Args, _: tokio_util::sync::CancellationToken)
pub fn mobile_run(args: Args, tun_mtu: u16) -> c_int { pub fn mobile_run(args: Args, tun_mtu: u16) -> c_int {
let shutdown_token = tokio_util::sync::CancellationToken::new(); let shutdown_token = tokio_util::sync::CancellationToken::new();
{ {
let mut lock = TUN_QUIT.lock().unwrap(); if let Ok(mut lock) = TUN_QUIT.lock() {
if lock.is_some() { if lock.is_some() {
log::error!("tun2proxy already started"); log::error!("tun2proxy already started");
return -1; return -1;
}
*lock = Some(shutdown_token.clone());
} else {
log::error!("failed to lock tun2proxy quit token");
return -2;
} }
*lock = Some(shutdown_token.clone());
} }
let block = async move { let block = async move {
@ -57,16 +61,12 @@ pub fn mobile_run(args: Args, tun_mtu: u16) -> c_int {
}, },
}; };
// release shutdown token before exit.
let mut lock = TUN_QUIT.lock().unwrap();
let _ = lock.take();
exit_code exit_code
} }
pub fn mobile_stop() -> c_int { pub fn mobile_stop() -> c_int {
if let Ok(lock) = TUN_QUIT.lock() { if let Ok(mut lock) = TUN_QUIT.lock() {
if let Some(shutdown_token) = lock.as_ref() { if let Some(shutdown_token) = lock.take() {
shutdown_token.cancel(); shutdown_token.cancel();
return 0; return 0;
} }