From d8191ecf4a032f5b4e227a5038b8c5cd0d1de001 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Sat, 1 Jun 2024 23:09:17 +0800 Subject: [PATCH] fix(local-tun): Linux already has IFF_NO_PI, macOS already set route --- .../shadowsocks-service/src/local/tun/mod.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/crates/shadowsocks-service/src/local/tun/mod.rs b/crates/shadowsocks-service/src/local/tun/mod.rs index 596ecd7e..c738f8f1 100644 --- a/crates/shadowsocks-service/src/local/tun/mod.rs +++ b/crates/shadowsocks-service/src/local/tun/mod.rs @@ -108,11 +108,13 @@ impl TunBuilder { pub async fn build(mut self) -> io::Result { self.tun_config.layer(Layer::L3).up(); - #[cfg(target_os = "linux")] - self.tun_config.platform_config(|tun_config| { - // IFF_NO_PI preventing excessive buffer reallocating - tun_config.packet_information(false); - }); + // XXX: tun2 set IFF_NO_PI by default. + // + // #[cfg(target_os = "linux")] + // self.tun_config.platform_config(|tun_config| { + // // IFF_NO_PI preventing excessive buffer reallocating + // tun_config.packet_information(false); + // }); let device = match create_as_async(&self.tun_config) { Ok(d) => d, @@ -203,9 +205,10 @@ impl Tun { ); // Set default route - if let Err(err) = sys::set_route_configuration(self.device.as_mut()).await { - warn!("[TUN] tun device set route failed, error: {}", err); - } + // XXX: tun2 already set it by default. + // if let Err(err) = sys::set_route_configuration(self.device.as_mut()).await { + // warn!("[TUN] tun device set route failed, error: {}", err); + // } let address_broadcast = address_net.broadcast();