From 80670aab5972367917d1460bfacc93bf29616b9c Mon Sep 17 00:00:00 2001 From: alterdekim Date: Mon, 9 Dec 2024 19:08:49 +0300 Subject: [PATCH] modified: frida_client/src/client.rs modified: frida_core/src/device.rs modified: frida_core/src/linux_tun.rs --- frida_client/src/client.rs | 4 ++-- frida_core/src/device.rs | 14 +++++++------- frida_core/src/linux_tun.rs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frida_client/src/client.rs b/frida_client/src/client.rs index 90b49dd..24f0933 100644 --- a/frida_client/src/client.rs +++ b/frida_client/src/client.rs @@ -273,8 +273,8 @@ pub mod desktop { info!("client_address: {:?}", &self.client_config.client.address); let mut config = AbstractDevice::default(); config.address(self.client_config.client.address.parse().unwrap()) - .netmask(std::net::IpAddr::V4(Ipv4Addr::new(255, 255, 255, 255))) - .destination(std::net::IpAddr::V4(Ipv4Addr::new(10, 66, 66, 1))) + .netmask(Ipv4Addr::new(255, 255, 255, 255)) + .destination(Ipv4Addr::new(10, 66, 66, 1)) .mtu(1400) .tun_name("tun0"); diff --git a/frida_core/src/device.rs b/frida_core/src/device.rs index 78870ff..3e3308a 100644 --- a/frida_core/src/device.rs +++ b/frida_core/src/device.rs @@ -1,27 +1,27 @@ -use std::net::IpAddr; +use std::net::Ipv4Addr; #[derive(Default)] pub struct AbstractDevice { - pub(crate) address: Option, - pub(crate) netmask: Option, - pub(crate) destination: Option, + pub(crate) address: Option, + pub(crate) netmask: Option, + pub(crate) destination: Option, pub(crate) mtu: Option, pub(crate) tun_name: Option } impl AbstractDevice { - pub fn address(&mut self, address: IpAddr) -> &mut Self { + pub fn address(&mut self, address: Ipv4Addr) -> &mut Self { self.address = Some(address); self } - pub fn netmask(&mut self, netmask: IpAddr) -> &mut Self { + pub fn netmask(&mut self, netmask: Ipv4Addr) -> &mut Self { self.netmask = Some(netmask); self } - pub fn destination(&mut self, destination: IpAddr) -> &mut Self { + pub fn destination(&mut self, destination: Ipv4Addr) -> &mut Self { self.destination = Some(destination); self } diff --git a/frida_core/src/linux_tun.rs b/frida_core/src/linux_tun.rs index 2fc91d2..f933083 100644 --- a/frida_core/src/linux_tun.rs +++ b/frida_core/src/linux_tun.rs @@ -9,7 +9,7 @@ pub fn create(cfg: AbstractDevice) -> (DeviceReader, DeviceWriter) { let tun = Arc::new( Tun::builder() .name(&cfg.tun_name.unwrap()) // if name is empty, then it is set by kernel. - .mtu(cfg.mtu.unwrap()) + .mtu(cfg.mtu.unwrap().into()) .address(cfg.address.unwrap()) .netmask(cfg.netmask.unwrap()) .destination(cfg.destination.unwrap())