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

modified: frida_client/src/client.rs

Browse Source 
modified:   frida_core/src/android_tun.rs
This commit is contained in:
Michael Wain 2024-12-11 01:27:29 +03:00
parent 186bc1903a
commit 8e15facee3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frida_client/src/client.rs
View File

@ -180,9 +180,9 @@ pub mod android {
async fn start(&self) { async fn start(&self) {
info!("FD: {:?}", &self.fd); info!("FD: {:?}", &self.fd);
let mtu: u16 = 1400; let mtu: u16 = 1400;
let (reader, writer) = frida_core::create(self.fd);
let mut client = CoreVpnClient{client_config: self.client_config.clone(), close_token: self.close_token.clone()}; let mut client = CoreVpnClient{client_config: self.client_config.clone(), close_token: self.close_token.clone()};
info!("SSS: {:?}", &self.client_config.server.endpoint); info!("SSS: {:?}", &self.client_config.server.endpoint);
let (reader, writer) = frida_core::create(self.fd);
let sock = UdpSocket::bind("0.0.0.0:0").await.unwrap(); let sock = UdpSocket::bind("0.0.0.0:0").await.unwrap();
sock.connect(&self.client_config.server.endpoint).await.unwrap(); sock.connect(&self.client_config.server.endpoint).await.unwrap();
client.start(sock, reader, writer, mtu).await; client.start(sock, reader, writer, mtu).await;

11
frida_core/src/android_tun.rs
View File

@ -8,13 +8,13 @@ pub fn create(cfg: i32) -> (DeviceReader, DeviceWriter) {
let fd1 = cfg.clone(); let fd1 = cfg.clone();
let fd2 = fd1.clone(); let fd2 = fd1.clone();
let mut reader = unsafe { File::from_raw_fd(fd1) }; let mut reader = unsafe { File::from_raw_fd(fd1) };
//let mut writer = unsafe { File::from_raw_fd(fd2) }; let mut writer = unsafe { File::from_raw_fd(fd2) };
(DeviceReader {reader}, DeviceWriter {writer: None}) (DeviceReader {reader}, DeviceWriter {writer})
} }
pub struct DeviceWriter { pub struct DeviceWriter {
writer: Option<File> writer: File
} }
pub struct DeviceReader { pub struct DeviceReader {
@ -23,10 +23,7 @@ pub struct DeviceReader {
impl DeviceWriter { impl DeviceWriter {
pub async fn write(&mut self, buf: &Vec<u8>) -> Result<usize, Box<dyn Error>> { pub async fn write(&mut self, buf: &Vec<u8>) -> Result<usize, Box<dyn Error>> {
/*if self.writer.is_some() { Ok(self.writer.unwrap().write(buf).await?)
return Ok(self.writer.unwrap().write(buf).await?);
}*/
Ok(0)
} }
} }