From 551407486147dd9995d8c4fc6e93cd4309e3694f Mon Sep 17 00:00:00 2001 From: alterdekim Date: Tue, 8 Oct 2024 02:00:03 +0300 Subject: [PATCH] modified: src/client.rs --- src/client.rs | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/client.rs b/src/client.rs index 003e89a..e8c64d3 100644 --- a/src/client.rs +++ b/src/client.rs @@ -122,31 +122,30 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32, env: &JNIE let s_cipher = cipher_shared.clone(); loop { - tokio::select! { - b = lrx.recv() => { - FridaLib::traceFromNative(&env, String::from_utf8_lossy(&b.unwrap()).to_string()); - } - b = mx.recv() => { - let bytes = b.unwrap(); - let s_c = s_cipher.lock().await; + if let Ok(bytes) = lrx.try_recv() { + FridaLib::traceFromNative(&env, String::from_utf8_lossy(&bytes).to_string()); + } + if let Ok(bytes) = mx.try_recv() { + let s_c = s_cipher.lock().await; + + if s_c.is_some() { + let aes = Aes256Gcm::new(s_c.as_ref().unwrap().as_bytes().into()); + let nonce = Aes256Gcm::generate_nonce(&mut OsRng); + let ciphered_data = aes.encrypt(&nonce, &bytes[..]); - if s_c.is_some() { - let aes = Aes256Gcm::new(s_c.as_ref().unwrap().as_bytes().into()); - let nonce = Aes256Gcm::generate_nonce(&mut OsRng); - let ciphered_data = aes.encrypt(&nonce, &bytes[..]); - - if let Ok(ciphered_d) = ciphered_data { - let vpn_packet = UDPVpnPacket{ data: ciphered_d, nonce: nonce.to_vec()}; - let serialized_data = vpn_packet.serialize(); - ltx.send("Write to socket".as_bytes().to_vec()); - sock_snd.send(&serialized_data).await.unwrap(); - } else { - ltx.send("Socket encryption failed.".as_bytes().to_vec()); - } + if let Ok(ciphered_d) = ciphered_data { + let vpn_packet = UDPVpnPacket{ data: ciphered_d, nonce: nonce.to_vec()}; + let serialized_data = vpn_packet.serialize(); + ltx.send("Write to socket".as_bytes().to_vec()); + sock_snd.send(&serialized_data).await.unwrap(); } else { - ltx.send("There is no shared_secret in main loop".as_bytes().to_vec()); + ltx.send("Socket encryption failed.".as_bytes().to_vec()); } + } else { + ltx.send("There is no shared_secret in main loop".as_bytes().to_vec()); } } } + + } \ No newline at end of file