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

Changes to be committed:

Browse Source 
modified:   src/tcp_client.rs
	modified:   src/tcp_server.rs
This commit is contained in:
Michael Wain 2024-08-12 04:24:52 +03:00
parent 673413fabc
commit 5bc50b0e29
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tcp_client.rs
View File

@ -9,6 +9,7 @@ use std::sync::Arc;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::collections::HashMap; use std::collections::HashMap;
use std::process::Command; use std::process::Command;
use tokio::io::AsyncReadExt;
fn configure_routes() { fn configure_routes() {
let ip_output = Command::new("ip") let ip_output = Command::new("ip")
@ -93,16 +94,14 @@ pub async fn client_mode(remote_addr: String) {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
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();
info!("Got from tun");
} }
}); });
tokio::spawn(async move { tokio::spawn(async move {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
loop { loop {
if let Ok(n) = sock_reader.try_read(&mut buf) { if let Ok(n) = sock_reader.read(&mut buf).await {
tx.send(buf[..n].to_vec()).unwrap(); tx.send(buf[..n].to_vec()).unwrap();
info!("Got from sock");
} }
} }
}); });

5
src/tcp_server.rs
View File

@ -8,6 +8,7 @@ use log::{error, info, LevelFilter};
use std::sync::Arc; use std::sync::Arc;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::collections::HashMap; use std::collections::HashMap;
use tokio::io::AsyncReadExt;
pub async fn server_mode() { pub async fn server_mode() {
info!("Starting server..."); info!("Starting server...");
@ -39,7 +40,6 @@ pub async fn server_mode() {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
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();
info!("Got from tun");
} }
}); });
@ -63,9 +63,8 @@ pub async fn server_mode() {
tokio::spawn(async move { tokio::spawn(async move {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
loop { loop {
if let Ok(n) = sock_reader.try_read(&mut buf) { if let Ok(n) = sock_reader.read(&mut buf).await {
thread_tx.send(buf[..n].to_vec()).unwrap(); thread_tx.send(buf[..n].to_vec()).unwrap();
info!("Got from sock");
} }
} }
}); });