From 39c170892e1bc2472a783bd7ee73c63def12b35e Mon Sep 17 00:00:00 2001 From: lbl <49143209+lbl8603@users.noreply.github.com> Date: Sat, 28 Jun 2025 17:29:59 +0800 Subject: [PATCH] fmt --- vnt/src/core/mod.rs | 20 +++++++++----------- vnt/src/handle/recv_data/server.rs | 11 ++++++----- vnt/src/util/dns_query.rs | 20 ++++++++------------ 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/vnt/src/core/mod.rs b/vnt/src/core/mod.rs index 0f56737..c55262e 100644 --- a/vnt/src/core/mod.rs +++ b/vnt/src/core/mod.rs @@ -147,24 +147,22 @@ impl Config { &LocalInterface::default(), ); match address_result { - Ok(address) => { - match address_choose(address) { - Ok(resolved_address) => { - server_address = resolved_address; - } - Err(e) => { - log::error!("Failed to choose address: {}", e); - println!("Failed to choose address: {}", e); - } + Ok(address) => match address_choose(address) { + Ok(resolved_address) => { + server_address = resolved_address; } - } + Err(e) => { + log::error!("Failed to choose address: {}", e); + println!("Failed to choose address: {}", e); + } + }, Err(e) => { log::error!("DNS query failed: {}", e); println!("DNS query failed: {}", e); } } } - + #[cfg(feature = "port_mapping")] let port_mapping_list = crate::port_mapping::convert(port_mapping_list)?; diff --git a/vnt/src/handle/recv_data/server.rs b/vnt/src/handle/recv_data/server.rs index bd6dd53..bd66f24 100644 --- a/vnt/src/handle/recv_data/server.rs +++ b/vnt/src/handle/recv_data/server.rs @@ -390,11 +390,12 @@ impl ServerPacketHandler { "device_fd == 0".into(), )); } else { - let device = unsafe { tun_rs::SyncDevice::from_fd(device_fd as _) }; - if let Err(e) = self.tun_device_helper.start( - Arc::new(device), - self.config_info.allow_wire_guard, - ) { + let device = + unsafe { tun_rs::SyncDevice::from_fd(device_fd as _) }; + if let Err(e) = self + .tun_device_helper + .start(Arc::new(device), self.config_info.allow_wire_guard) + { self.callback.error(ErrorInfo::new_msg( ErrorType::FailedToCrateDevice, format!("{:?}", e), diff --git a/vnt/src/util/dns_query.rs b/vnt/src/util/dns_query.rs index 25643a5..e3067b2 100644 --- a/vnt/src/util/dns_query.rs +++ b/vnt/src/util/dns_query.rs @@ -1,14 +1,14 @@ +use crate::channel::socket::LocalInterface; +use anyhow::Context; +use dns_parser::{Builder, Packet, QueryClass, QueryType, RData, ResponseCode}; +use http_req::request::{RedirectPolicy, Request}; +use http_req::uri::Uri; use std::cell::RefCell; use std::collections::HashMap; use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs, UdpSocket}; use std::str::FromStr; use std::time::Duration; use std::{io, thread}; -use http_req::request::{Request, RedirectPolicy}; -use http_req::uri::Uri; -use crate::channel::socket::LocalInterface; -use anyhow::Context; -use dns_parser::{Builder, Packet, QueryClass, QueryType, RData, ResponseCode}; thread_local! { static HISTORY: RefCell> = RefCell::new(HashMap::new()); @@ -97,7 +97,6 @@ pub fn dns_query_all( // 执行重定向检查 if let Some(stripped) = redirect_domain { if let Some(redirected_url) = check_for_redirect(&stripped)? { - // 去掉 URL 开头的协议部分 let final_domain = remove_http_prefix(&redirected_url); println!("Server Address: {}", final_domain); @@ -214,8 +213,8 @@ fn parse_host_port(addr: &str) -> bool { // 处理 IPv6 地址(格式为 [::1]:8080) if addr.starts_with('[') { if let Some(idx) = addr.rfind(']') { - if let Some(port_idx) = addr[idx+1..].find(':') { - let port = &addr[idx+1+port_idx+1..]; // 提取端口部分 + if let Some(port_idx) = addr[idx + 1..].find(':') { + let port = &addr[idx + 1 + port_idx + 1..]; // 提取端口部分 return !port.is_empty() && port.chars().all(|c| c.is_numeric()); } } @@ -248,9 +247,7 @@ fn check_for_redirect(domain: &String) -> anyhow::Result> { // 解析 URL let uri = match Uri::try_from(url.as_str()) { - Ok(u) => { - u - } + Ok(u) => u, Err(e) => { println!("解析地址失败: {}", e); return Ok(last_redirect_url); @@ -288,7 +285,6 @@ fn check_for_redirect(domain: &String) -> anyhow::Result> { return Ok(last_redirect_url); } } - // 处理 200 响应 else if response.status_code().is_success() { for line in body_str.lines() {