alterwain/Frida-android-native
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: src/client.rs
Some checks failed
gitea/Frida-android-native/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Michael Wain 2024-10-13 21:06:56 +03:00
parent 055e127475
commit f433df23fa
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client.rs
View File

@ -27,7 +27,8 @@ use crate::jni::FridaLib;
pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_token: CancellationToken) { pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_token: CancellationToken) {
info!("Starting client..."); info!("Starting client...");
let subtasks_quit: std::sync::Mutex<tokio_util::sync::CancellationToken> = std::sync::Mutex::new(tokio_util::sync::CancellationToken::new()); let dr_cancel: CancellationToken = CancellationToken::new();
let sr_cancel: CancellationToken = CancellationToken::new();
let sock = UdpSocket::bind("0.0.0.0:25565").await.unwrap(); let sock = UdpSocket::bind("0.0.0.0:25565").await.unwrap();
sock.connect(&client_config.server.endpoint).await.unwrap(); sock.connect(&client_config.server.endpoint).await.unwrap();
@ -46,13 +47,11 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
let cipher_shared: Arc<Mutex<Option<x25519_dalek::SharedSecret>>> = Arc::new(Mutex::new(None)); let cipher_shared: Arc<Mutex<Option<x25519_dalek::SharedSecret>>> = Arc::new(Mutex::new(None));
let cancel_dr = subtasks_quit.clone();
let dev_read_task = tokio::spawn(async move { let dev_read_task = tokio::spawn(async move {
let mut buf = vec![0; 1400]; // mtu let mut buf = vec![0; 1400]; // mtu
loop { loop {
let sf = cancel_dr.lock().unwrap();
tokio::select! { tokio::select! {
_ = sf.cancelled() => { _ = cancel_dr.cancelled() => {
info!("Cancellation token has been thrown dev_read_task"); info!("Cancellation token has been thrown dev_read_task");
return; return;
} }
@ -63,21 +62,18 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
} }
} }
}; };
drop(sf);
} }
}); });
let priv_key = BASE64_STANDARD.decode(client_config.client.private_key).unwrap(); let priv_key = BASE64_STANDARD.decode(client_config.client.private_key).unwrap();
let cipher_shared_clone = cipher_shared.clone(); let cipher_shared_clone = cipher_shared.clone();
let cancel_sr = subtasks_quit.clone();
let sock_read_task = tokio::spawn(async move { let sock_read_task = tokio::spawn(async move {
let mut buf = vec![0; 4096]; let mut buf = vec![0; 4096];
loop { loop {
let sf = cancel_sr.lock().unwrap();
tokio::select! { tokio::select! {
_ = sf.cancelled() => { _ = sr_cancel.cancelled() => {
info!("Cancellation token has been thrown sock_read_task"); info!("Cancellation token has been thrown sock_read_task");
return; return;
} }
@ -124,7 +120,6 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
} }
} }
}; };
drop(sf);
} }
}); });
@ -142,9 +137,8 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, close_toke
tokio::select! { tokio::select! {
_ = close_token.cancelled() => { _ = close_token.cancelled() => {
info!("Cancellation token has been thrown"); info!("Cancellation token has been thrown");
if let Ok(mut l) = subtasks_quit.lock() { sr_cancel.cancel();
l.cancel(); dr_cancel.cancel();
}
dev_read_task.await; dev_read_task.await;
sock_read_task.await; sock_read_task.await;
return; return;