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

Compare commits

base: alterwain:a79c0250ed7e5d3f35429bffb7d106c7972ce79c
Branches Tags
alterwain:main
..
compare: alterwain:5f425435f5642f833f4e3c30abcb57006f43c50b
Branches Tags
alterwain:main

No commits in common. "a79c0250ed7e5d3f35429bffb7d106c7972ce79c" and "5f425435f5642f833f4e3c30abcb57006f43c50b" have entirely different histories.
a79c0250ed ... 5f425435f5

2 changed files with 5 additions and 10 deletions
Show Stats Expand all files Collapse all files

8
frida_client/src/client.rs
View File

@ -68,10 +68,8 @@ pub mod general {
loop { loop {
match dev_reader.read(&mut buf).await { match dev_reader.read(&mut buf).await {
Ok(n) => { Ok(n) => {
#[cfg(not(target_os = "macos"))] //info!("Read from tun.");
dx.send(buf[..n].to_vec()).unwrap(); dx.send(buf[..n].to_vec()).unwrap();
#[cfg(target_os = "macos")]
dx.send(buf[4..n].to_vec()).unwrap();
}, },
Err(_e) => { /*error!("Read failed {}", e);*/ } Err(_e) => { /*error!("Read failed {}", e);*/ }
} }
@ -89,8 +87,6 @@ pub mod general {
rr = rx.recv() => { rr = rx.recv() => {
if let Some(bytes) = rr { if let Some(bytes) = rr {
//info!("Write to tun. len={:?}", bytes.len()); //info!("Write to tun. len={:?}", bytes.len());
#[cfg(target_os = "macos")]
let bytes = [vec![0, 0, 0, 2], bytes].concat();
if let Err(e) = dev_writer.write(&bytes).await { if let Err(e) = dev_writer.write(&bytes).await {
//error!("Writing error: {:?}", e); //error!("Writing error: {:?}", e);
@ -344,7 +340,7 @@ pub mod desktop {
cmd("route", &["add", "-host", endpoint_ip, &gateway.unwrap()]); cmd("route", &["add", "-host", endpoint_ip, &gateway.unwrap()]);
cmd("route", &["change", "default", "-interface", "utun3"]); // TODO: change that cmd("route", &["change", "default", "-interface", "utun3"]); // todo: change that
cmd("route", &["add", "-host", endpoint_ip, &gateway.unwrap()]); cmd("route", &["add", "-host", endpoint_ip, &gateway.unwrap()]);
} }

7
frida_core/src/mac_tun.rs
View File

@ -1,10 +1,9 @@
use std::fs::File;
use std::io::{Read, Write};
use std::os::fd::{AsRawFd, FromRawFd}; use std::os::fd::{AsRawFd, FromRawFd};
use std::{ffi::CString, process::Command}; use std::{ffi::CString, process::Command};
use std::sync::Arc; use std::sync::Arc;
use std::error::Error; use std::error::Error;
use log::info; use log::info;
use tokio::fs::File;
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use crate::device::AbstractDevice; use crate::device::AbstractDevice;
@ -50,12 +49,12 @@ 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>> {
Ok(self.writer.write(buf)?) Ok(self.writer.write(buf).await?)
} }
} }
impl DeviceReader { impl DeviceReader {
pub async fn read(&mut self, buf: &mut Vec<u8>) -> Result<usize, Box<dyn Error>> { pub async fn read(&mut self, buf: &mut Vec<u8>) -> Result<usize, Box<dyn Error>> {
Ok(self.reader.read(buf)?) Ok(self.reader.read_buf(buf).await?)
} }
} }