From 453234bf8df9be83215d43f300c1bd4000beab2b Mon Sep 17 00:00:00 2001 From: lbl <1791778603@qq.com> Date: Sat, 22 Aug 2026 04:05:10 +0800 Subject: [PATCH] style: rustfmt tun general.rs --- vnt-core/src/tun/general.rs | 60 +++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/vnt-core/src/tun/general.rs b/vnt-core/src/tun/general.rs index 39d5614..2cb6a3c 100644 --- a/vnt-core/src/tun/general.rs +++ b/vnt-core/src/tun/general.rs @@ -9,10 +9,10 @@ use std::io; use std::net::Ipv4Addr; use std::sync::Arc; use tokio::sync::mpsc::{Receiver, Sender}; -use tun_rs::async_framed::{Decoder, DeviceFramedRead, DeviceFramedWrite, Encoder}; use tun_rs::AsyncDevice; #[cfg(not(target_os = "android"))] use tun_rs::DeviceBuilder; +use tun_rs::async_framed::{Decoder, DeviceFramedRead, DeviceFramedWrite, Encoder}; #[derive(Clone)] pub struct DeviceIOManager { @@ -130,40 +130,42 @@ impl DeviceIOManager { fn create_tun(config: DeviceConfig) -> anyhow::Result { #[cfg(target_os = "android")] { - let fd = config.tun_fd.context("Android requires a VpnService TUN fd")?; + let fd = config + .tun_fd + .context("Android requires a VpnService TUN fd")?; // SAFETY: The fd comes directly from ParcelFileDescriptor returned by // VpnService.Builder.establish and remains open for the network lifetime. return unsafe { Ok(AsyncDevice::from_fd(fd)?) }; } #[cfg(not(target_os = "android"))] { - #[cfg(unix)] - if let Some(fd) = config.tun_fd { - // SAFETY: Caller must ensure fd is a valid, open file descriptor for a TUN device. - // Using an invalid fd may cause undefined behavior. - unsafe { return Ok(AsyncDevice::from_fd(fd)?) } - } - let mut builder = DeviceBuilder::new(); - if let Some(tun_name) = config.tun_name { - builder = builder.name(tun_name); - } - if let Some(mtu) = config.mtu { - builder = builder.mtu(mtu); - } - #[cfg(windows)] - { - builder = builder.metric(1); - } - #[cfg(target_os = "linux")] - { - builder = builder.offload(true); - } - let dev = builder.build_async().context("创建tun失败")?; - #[cfg(target_os = "linux")] - { - _ = dev.set_tx_queue_len(1000); - } - Ok(dev) + #[cfg(unix)] + if let Some(fd) = config.tun_fd { + // SAFETY: Caller must ensure fd is a valid, open file descriptor for a TUN device. + // Using an invalid fd may cause undefined behavior. + unsafe { return Ok(AsyncDevice::from_fd(fd)?) } + } + let mut builder = DeviceBuilder::new(); + if let Some(tun_name) = config.tun_name { + builder = builder.name(tun_name); + } + if let Some(mtu) = config.mtu { + builder = builder.mtu(mtu); + } + #[cfg(windows)] + { + builder = builder.metric(1); + } + #[cfg(target_os = "linux")] + { + builder = builder.offload(true); + } + let dev = builder.build_async().context("创建tun失败")?; + #[cfg(target_os = "linux")] + { + _ = dev.set_tx_queue_len(1000); + } + Ok(dev) } } fn create(