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

Changes to be committed:

Browse Source 
modified:   src/client.rs
This commit is contained in:
Michael Wain 2024-09-26 02:50:56 +03:00
parent 52eb094aa5
commit 1887d32241
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/client.rs
View File

@ -38,14 +38,14 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32) {
let cipher_shared = Arc::new(Mutex::new(None)); let cipher_shared = Arc::new(Mutex::new(None));
tokio::spawn(async move { let tun_writer_task = tokio::spawn(async move {
while let Ok(bytes) = rx.recv() { while let Ok(bytes) = rx.recv() {
info!("Write to tun"); info!("Write to tun");
dev_writer.write_all(&bytes).unwrap(); dev_writer.write_all(&bytes).unwrap();
} }
}); });
tokio::spawn(async move { let tun_reader_task = tokio::spawn(async move {
let mut buf = vec![0; 8192]; let mut buf = vec![0; 8192];
while let Ok(n) = dev_reader.read(&mut buf) { while let Ok(n) = dev_reader.read(&mut buf) {
dx.send(buf[..n].to_vec()).unwrap(); dx.send(buf[..n].to_vec()).unwrap();
@ -55,7 +55,7 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32) {
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();
tokio::spawn(async move { let socket_reader_task = tokio::spawn(async move {
let mut buf = vec![0; 4096]; let mut buf = vec![0; 4096];
loop { loop {
@ -101,36 +101,41 @@ pub async fn client_mode(client_config: ClientConfiguration, fd: i32) {
} }
}); });
let pkey = BASE64_STANDARD.decode(client_config.client.public_key).unwrap();
let handshake = UDPVpnHandshake{ public_key: pkey, request_ip: client_config.client.address.parse::<Ipv4Addr>().unwrap() };
let mut nz = 0;
while nz < 25 {
sock_snd.send(&handshake.serialize()).await.unwrap();
nz += 1
}
//sock_snd.send(&handshake.serialize()).await.unwrap();
let s_cipher = cipher_shared.clone(); let s_cipher = cipher_shared.clone();
loop {
if let Ok(bytes) = mx.recv() { let socket_writer_task = tokio::spawn(async move {
let s_c = s_cipher.lock().await; let pkey = BASE64_STANDARD.decode(client_config.client.public_key).unwrap();
let handshake = UDPVpnHandshake{ public_key: pkey, request_ip: client_config.client.address.parse::<Ipv4Addr>().unwrap() };
if s_c.is_some() { let mut nz = 0;
let aes = Aes256Gcm::new(s_c.as_ref().unwrap().as_bytes().into()); while nz < 25 {
let nonce = Aes256Gcm::generate_nonce(&mut OsRng); sock_snd.send(&handshake.serialize()).await.unwrap();
let ciphered_data = aes.encrypt(&nonce, &bytes[..]); nz += 1
}
//sock_snd.send(&handshake.serialize()).await.unwrap();
loop {
if let Ok(bytes) = mx.recv() {
let s_c = s_cipher.lock().await;
if let Ok(ciphered_d) = ciphered_data { if s_c.is_some() {
let vpn_packet = UDPVpnPacket{ data: ciphered_d, nonce: nonce.to_vec()}; let aes = Aes256Gcm::new(s_c.as_ref().unwrap().as_bytes().into());
let serialized_data = vpn_packet.serialize(); let nonce = Aes256Gcm::generate_nonce(&mut OsRng);
info!("Sent to socket"); let ciphered_data = aes.encrypt(&nonce, &bytes[..]);
sock_snd.send(&serialized_data).await.unwrap();
if let Ok(ciphered_d) = ciphered_data {
let vpn_packet = UDPVpnPacket{ data: ciphered_d, nonce: nonce.to_vec()};
let serialized_data = vpn_packet.serialize();
info!("Sent to socket");
sock_snd.send(&serialized_data).await.unwrap();
} else {
error!("Socket encryption failed.");
}
} else { } else {
error!("Socket encryption failed."); warn!("There is no shared_secret in main loop");
} }
} else {
warn!("There is no shared_secret in main loop");
} }
} }
} });
tokio::join!(tun_writer_task, tun_reader_task, socket_writer_task, socket_reader_task);
} }