diff --git a/src/args_config.rs b/src/args_config.rs index 7c0f4aea..926d2fe7 100644 --- a/src/args_config.rs +++ b/src/args_config.rs @@ -37,6 +37,10 @@ pub struct FileConfig { #[serde(rename = "no_tun", skip_serializing)] pub legacy_no_tun: Option, pub mtu: Option, + /// 隧道 DNS:是否把 dns 应用到虚拟网卡接口 DNS(默认 false) + pub dns_tunnel: Option, + /// 隧道 DNS 服务器地址列表(严格 IPv4,主备顺序) + pub dns: Option>, pub ctrl_port: Option, pub port_mapping: Option>, pub allow_mapping: Option, @@ -98,6 +102,8 @@ impl FileConfig { device_mode, legacy_no_tun, mtu, + dns_tunnel, + dns, ctrl_port, port_mapping, allow_mapping, @@ -271,6 +277,12 @@ pub struct Args { /// 设置mtu #[clap(long)] pub mtu: Option, + /// DNS 是否走隧道(把 dns 应用到虚拟网卡接口 DNS,默认关闭) + #[clap(long)] + pub dns_tunnel: bool, + /// 隧道 DNS 服务器地址,可重复指定;第 1 条主用,其余备用(仅 IPv4) + #[clap(long = "dns")] + pub dns: Vec, /// 控制端口,设置0时禁用控制服务 #[clap(long)] pub ctrl_port: Option, @@ -436,6 +448,14 @@ fn build_from_args_and_file(args: Args, file: FileConfig) -> anyhow::Result<(Con no_nat: args.no_nat || file.no_nat.unwrap_or(false), device_mode: args.device_mode.or(file.device_mode).unwrap_or_default(), mtu: args.mtu.or(file.mtu), + dns_tunnel: args.dns_tunnel || file.dns_tunnel.unwrap_or(false), + dns: parse_dns_servers( + if args.dns.is_empty() { + file.dns.clone().unwrap_or_default() + } else { + args.dns.clone() + }, + )?, port_mapping, allow_port_mapping: args.allow_mapping || file.allow_mapping.unwrap_or(false), udp_stun, @@ -490,6 +510,8 @@ fn build_from_args_only(args: Args) -> anyhow::Result<(Config, CtrlConfig)> { no_nat: args.no_nat, device_mode: args.device_mode.unwrap_or_default(), mtu: args.mtu, + dns_tunnel: args.dns_tunnel, + dns: parse_dns_servers(args.dns.clone())?, port_mapping: args.port_mapping, allow_port_mapping: args.allow_mapping, tunnel_addr, @@ -569,6 +591,8 @@ fn build_from_file_only(file: FileConfig) -> anyhow::Result<(Config, CtrlConfig) no_nat: file.no_nat.unwrap_or(false), device_mode: file.device_mode.unwrap_or_default(), mtu: file.mtu, + dns_tunnel: file.dns_tunnel.unwrap_or(false), + dns: parse_dns_servers(file.dns.clone().unwrap_or_default())?, port_mapping, allow_port_mapping: file.allow_mapping.unwrap_or(false), udp_stun, @@ -584,6 +608,23 @@ fn build_from_file_only(file: FileConfig) -> anyhow::Result<(Config, CtrlConfig) Ok((config, ctrl_config)) } +/// 解析并校验隧道 DNS 服务器列表:每条必须是合法 IPv4 点分十进制, +/// 忽略空项。非法地址直接报错(配置层拦截)。返回值按原始顺序保留主备语义。 +fn parse_dns_servers(values: Vec) -> anyhow::Result> { + let mut servers = Vec::with_capacity(values.len()); + for raw in values { + let value = raw.trim(); + if value.is_empty() { + continue; + } + let ip = value.parse::().map_err(|error| { + anyhow::anyhow!("DNS 地址无效:{value}(需为 IPv4 点分十进制):{error}") + })?; + servers.push(ip); + } + Ok(servers) +} + fn resolve_tunnel_binding( cli_addr: &[SocketAddr], cli_port: Option, @@ -718,6 +759,12 @@ server = ["quic://1.2.3.4:29872"] # MTU 设置 # mtu = 1400 +# 隧道 DNS:是否把 dns 应用到虚拟网卡接口 DNS(默认 false,关闭则沿用系统/物理网卡 DNS) +# 开启后,下方 dns 列表会写入虚拟网卡接口 DNS:第 1 条主用,其余备用。 +# 建议填 VNT 对端(路由器)的隧道 IP,例如 10.26.0.3;每条必须是合法 IPv4。 +# dns_tunnel = false +# dns = ["10.26.0.3", "223.5.5.5"] + # --- 设备配置 --- # 设备名称 (可选,默认读取本机 hostname) @@ -774,6 +821,31 @@ server = ["quic://1.2.3.4:29872"] mod tests { use super::*; + #[test] + fn dns_servers_parse_and_reject_invalid() { + let ok = parse_dns_servers(vec!["10.26.0.3".into(), " 223.5.5.5 ".into(), "".into()]).unwrap(); + assert_eq!(ok, vec!["10.26.0.3".parse::().unwrap(), "223.5.5.5".parse().unwrap()]); + assert!(parse_dns_servers(vec!["999.1.1.1".into()]).is_err()); + assert!(parse_dns_servers(vec!["10.26.0".into()]).is_err()); + assert!(parse_dns_servers(vec!["abc".into()]).is_err()); + } + + #[test] + fn dns_fields_parse_from_file_and_overlay() { + let remote: FileConfig = toml::from_str( + "server=['tcp://remote:29872']\nnetwork_code='n'\ndns_tunnel=true\ndns=['10.26.0.3']", + ) + .unwrap(); + assert_eq!(remote.dns_tunnel, Some(true)); + assert_eq!(remote.dns.as_deref(), Some(&["10.26.0.3".to_string()][..])); + let local: FileConfig = toml::from_str( + "network_code='n'\ndns=['1.1.1.1','8.8.8.8']", + ) + .unwrap(); + let merged = remote.overlay(local); + assert_eq!(merged.dns.as_deref(), Some(&["1.1.1.1".to_string(), "8.8.8.8".to_string()][..])); + } + #[test] fn subscription_uses_sub_cli_flag() { let args = Args::try_parse_from(["vnt", "--sub", "vnt2://join/2/example"]).unwrap(); diff --git a/vnt-core/src/context/config.rs b/vnt-core/src/context/config.rs index 779add6e..ffa41448 100644 --- a/vnt-core/src/context/config.rs +++ b/vnt-core/src/context/config.rs @@ -557,6 +557,12 @@ pub struct Config { pub no_nat: bool, pub device_mode: DeviceMode, pub mtu: Option, + /// 隧道 DNS:是否把 `dns` 中的服务器应用到虚拟网卡接口 DNS。默认关闭, + /// 关闭时不注入任何隧道 DNS,沿用物理网卡/系统 DNS。 + pub dns_tunnel: bool, + /// 隧道 DNS 服务器地址列表(严格 IPv4 点分十进制),按顺序即主备顺序, + /// 第 1 条为主用,其余为备用。仅在 `dns_tunnel=true` 时生效。 + pub dns: Vec, pub port_mapping: Vec, pub allow_port_mapping: bool, pub udp_stun: Vec, @@ -707,6 +713,12 @@ impl Config { if let Some(mtu) = self.mtu { table.insert("mtu".into(), i64::from(mtu).into()); } + // 隧道 DNS:仅在非默认时写入(dns_tunnel 默认 false,dns 默认空), + // 保持旧配置结构向后兼容。 + if self.dns_tunnel { + table.insert("dns_tunnel".into(), true.into()); + } + insert_string_array(&mut table, "dns", &self.dns); if let Some(tunnel_port) = self.tunnel_port { table.insert("tunnel_port".into(), i64::from(tunnel_port).into()); } @@ -1304,7 +1316,38 @@ mod tests { assert!(!text.contains("rtx"), "{text}"); assert!(!text.contains("no_punch"), "{text}"); assert!(!text.contains("password"), "{text}"); + // 隧道 DNS 默认不输出 + assert!(!text.contains("dns_tunnel"), "{text}"); + assert!(!text.contains("dns ="), "{text}"); // 输出本身是合法 TOML assert!(toml::from_str::(&text).is_ok(), "{text}"); } + + #[test] + fn to_toml_string_emits_tunnel_dns_when_enabled() { + let config = Config { + network_code: "net".to_string(), + device_id: "dev".to_string(), + dns_tunnel: true, + dns: vec![ + Ipv4Addr::new(10, 26, 0, 3), + Ipv4Addr::new(223, 5, 5, 5), + ], + ..Config::default() + }; + let text = config.to_toml_string(); + assert!(text.contains("dns_tunnel = true"), "{text}"); + assert!( + text.contains("dns = [\"10.26.0.3\", \"223.5.5.5\"]"), + "{text}" + ); + assert!(toml::from_str::(&text).is_ok(), "{text}"); + } + + #[test] + fn tunnel_dns_defaults_are_off_and_empty() { + let config = Config::default(); + assert!(!config.dns_tunnel); + assert!(config.dns.is_empty()); + } } diff --git a/vnt-core/src/core/change_runtime.rs b/vnt-core/src/core/change_runtime.rs index 1a5dc4c2..c47b2b7a 100644 --- a/vnt-core/src/core/change_runtime.rs +++ b/vnt-core/src/core/change_runtime.rs @@ -57,6 +57,13 @@ impl NetworkManager { let mtu_change = change.config.mtu.is_some() && change.config.mtu != self.config.mtu; #[cfg(any(target_os = "android", target_os = "ios", target_os = "tvos"))] let mtu_change = false; + // 桌面平台隧道 DNS 可热更新(接口 DNS);移动平台 DNS 由宿主 VPN + // 接口决定,归 needs_device_restart/needs_vpn_rebuild 覆盖 + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + let dns_change = change.config.dns_tunnel != self.config.dns_tunnel + || change.config.dns != self.config.dns; + #[cfg(any(target_os = "android", target_os = "ios", target_os = "tvos"))] + let dns_change = false; // Windows/Linux/FreeBSD 支持网卡名热变更(tun-rs set_name); // 恢复默认名(None)无法热应用,归 needs_device_restart 走重建 #[cfg(any(windows, target_os = "linux", target_os = "freebsd"))] @@ -64,7 +71,7 @@ impl NetworkManager { change.config.tun_name.is_some() && change.config.tun_name != self.config.tun_name; #[cfg(not(any(windows, target_os = "linux", target_os = "freebsd")))] let name_change = false; - structural_change || mtu_change || name_change + structural_change || mtu_change || dns_change || name_change } /// 判断快照是否包含只能通过重建实例生效的字段:password/cert_mode、 @@ -238,6 +245,13 @@ impl NetworkManager { if change.config.tun_name != self.config.tun_name { self.config.tun_name = change.config.tun_name.clone(); } + // 隧道 DNS 配置提交(桌面平台可热更新接口 DNS) + if change.config.dns_tunnel != self.config.dns_tunnel + || change.config.dns != self.config.dns + { + self.config.dns_tunnel = change.config.dns_tunnel; + self.config.dns = change.config.dns.clone(); + } self.commit_runtime_snapshot(change); if let Some(address) = desired { // 网关是注册时确定的虚拟网络属性,不随快照重算,沿用当前注册值 @@ -259,6 +273,10 @@ impl NetworkManager { // MTU 热更新:桌面平台 tun-rs 支持动态修改,无需重建设备 let mtu = change.config.mtu.or(self.config.mtu).unwrap_or(DEFAULT_MTU); self.device_io_manager.set_mtu(mtu).await?; + // 隧道 DNS 热更新:写虚拟网卡接口 DNS。dns_tunnel 关闭时清空 + // (恢复为空表示沿用系统/物理网卡 DNS)。 + let desired_dns = effective_dns(&change.config); + self.device_io_manager.set_dns(&desired_dns).await?; // 网卡名热更新:Windows/Linux/FreeBSD 由 tun-rs 支持,无需重建 #[cfg(any(windows, target_os = "linux", target_os = "freebsd"))] if let Some(tun_name) = &change.config.tun_name { @@ -326,6 +344,8 @@ impl NetworkManager { if let Some(tun_name) = change.config.tun_name.clone() { config = config.set_tun_name(tun_name); } + // 重建网卡同样按当前生效配置应用隧道 DNS。 + config = config.set_dns(effective_dns(&change.config)); Ok(config) } @@ -575,6 +595,8 @@ impl NetworkManager { address.is_some() || (change.config.mtu.is_some() && change.config.mtu != self.config.mtu) || change.config.tun_name != self.config.tun_name + || change.config.dns_tunnel != self.config.dns_tunnel + || change.config.dns != self.config.dns || normalized_routes(self.app_state.subnet_route.applied_routes()) != normalized_routes(change.routes.clone()) } @@ -686,7 +708,24 @@ fn instance_rebuild_fields_differ(current: &Config, target: &Config) -> bool { allow(dead_code) )] fn device_restart_fields_differ(current: &Config, target: &Config) -> bool { - current.mtu != target.mtu || current.tun_name != target.tun_name + current.mtu != target.mtu + || current.tun_name != target.tun_name + || current.dns_tunnel != target.dns_tunnel + || current.dns != target.dns +} + +/// 依据配置计算需要应用到虚拟网卡接口的隧道 DNS 服务器列表。 +/// 仅当 `dns_tunnel=true` 时返回 `dns`(已为合法 IPv4);关闭或为空返回空列表, +/// 表示沿用物理网卡/系统 DNS。 +/// +/// 纯计算、无平台依赖:桌面平台用于建卡/热更新,移动平台由宿主 VPN 接口 +/// 自行决定 DNS(这里保留以便 `start_device` 等共用代码在所有平台编译)。 +pub(crate) fn effective_dns(config: &Config) -> Vec { + if config.dns_tunnel { + config.dns.clone() + } else { + Vec::new() + } } #[cfg(test)] diff --git a/vnt-core/src/core/mod.rs b/vnt-core/src/core/mod.rs index 98d5aed3..d737ff5b 100644 --- a/vnt-core/src/core/mod.rs +++ b/vnt-core/src/core/mod.rs @@ -719,6 +719,8 @@ impl NetworkManager { if let Some(tun_name) = self.config.tun_name.clone() { config = config.set_tun_name(tun_name); } + // 隧道 DNS:建卡时按当前生效配置应用接口 DNS(桌面平台)。 + config = config.set_dns(crate::core::change_runtime::effective_dns(&self.config)); // 失败时 tun_receiver/enhanced_outbound 不会被消耗,可以重试 if let Err(e) = self .device_io_manager diff --git a/vnt-core/src/network_info.rs b/vnt-core/src/network_info.rs index cf519362..fbd7e9ac 100644 --- a/vnt-core/src/network_info.rs +++ b/vnt-core/src/network_info.rs @@ -52,6 +52,8 @@ pub fn merge_present_config( // 网卡类(桌面热应用 / 移动重建) overlay!("mtu", mtu); overlay!("tun_name", tun_name); + overlay!("dns", dns); + overlay!("dns_tunnel", dns_tunnel); // 策略类(apply_policy_change 热应用) overlay!("peer_address", peer_address); overlay!("turn", turn); diff --git a/vnt-core/src/tun/general.rs b/vnt-core/src/tun/general.rs index e92282f0..9b284351 100644 --- a/vnt-core/src/tun/general.rs +++ b/vnt-core/src/tun/general.rs @@ -35,6 +35,8 @@ struct DeviceState { network: Option<(Ipv4Addr, u8)>, mtu: Option, tun_name: Option, + /// 当前已应用到网卡接口的隧道 DNS 服务器(主备顺序)。 + dns: Vec, #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] ipv6_routes: Option, /// 虚拟 IPv6 配置失败后跳过后续尝试,网卡重建后重新检测。 @@ -71,6 +73,9 @@ pub struct DeviceConfig { pub tun_fd: Option, pub mtu: Option, pub mac_addr: Option<[u8; 6]>, + /// 建卡时需应用到本网卡接口的隧道 DNS 服务器(已过滤为合法 IPv4)。 + /// 为空表示不设置接口 DNS,沿用物理网卡/系统 DNS。 + pub dns: Vec, } impl DeviceConfig { @@ -95,7 +100,13 @@ impl DeviceConfig { self.mac_addr = Some(mac_addr); self } + /// 设置建卡时应用的隧道 DNS 服务器列表(主备顺序)。 + pub fn set_dns(mut self, dns: Vec) -> Self { + self.dns = dns; + self + } } + #[derive(Clone)] pub struct TunInbound { pub(crate) sender: Sender, @@ -136,6 +147,7 @@ impl DeviceIOManager { let device_mode = device_config.device_mode; let mtu = device_config.mtu; let tun_name = device_config.tun_name.clone(); + let dns = device_config.dns.clone(); let device = Arc::new(create_device(device_config)?); let Some(receiver_value) = receiver.take() else { bail!("device task already started"); @@ -162,6 +174,7 @@ impl DeviceIOManager { }); state.mtu = mtu; state.tun_name = tun_name; + state.dns = dns; Ok(()) } @@ -332,7 +345,37 @@ impl DeviceIOManager { Ok(()) } - /// 用宿主(VpnService)提供的 fd 替换运行中的虚拟网卡任务。Android + /// 动态修改运行中设备的隧道 DNS 服务器(接口 DNS)。Windows 通过 + /// `netsh` 设置网卡接口 DNS;其他桌面平台为空实现(记录 debug 日志, + /// 不报错以免中断变更应用)。变更后尽力刷新 DNS 缓存。 + #[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))] + pub async fn set_dns(&self, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + let mut guard = self.device.lock().await; + let Some(task) = guard + .runtime + .as_ref() + .and_then(|runtime| runtime.task.as_ref()) + else { + bail!("虚拟网卡尚未启动") + }; + if guard.dns == servers { + return Ok(()); + } + #[cfg(windows)] + { + let alias = task.device.name()?; + apply_interface_dns(&alias, servers)?; + } + #[cfg(not(windows))] + { + let _ = task; + log::debug!("当前平台暂不支持设置虚拟网卡接口 DNS,跳过(仅 Windows)"); + } + guard.dns = servers.to_vec(); + Ok(()) + } + + /// 专用:tun-rs 在该平台不支持 set_network_address,因此地址不通过 /// set_network 应用,而是随新任务一并写入 [`DeviceState`]。 #[cfg(target_os = "android")] @@ -542,6 +585,19 @@ fn create_device(config: DeviceConfig) -> anyhow::Result { { _ = dev.set_tx_queue_len(1000); } + // 隧道 DNS:建卡后把配置的 DNS 应用到本网卡接口。失败仅记录日志, + // 不影响网卡建立(与安卓版「非法地址跳过、不影响接口」一致)。 + #[cfg(windows)] + if !config.dns.is_empty() { + match dev.name() { + Ok(alias) => { + if let Err(error) = apply_interface_dns(&alias, &config.dns) { + log::warn!("应用隧道 DNS 失败(忽略,沿用系统 DNS): {error:#}"); + } + } + Err(error) => log::warn!("读取虚拟网卡名失败,跳过隧道 DNS: {error:#}"), + } + } Ok(dev) } } @@ -575,6 +631,73 @@ fn device_creation_error_context(mode: DeviceMode, error: &io::Error) -> &'stati DeviceMode::Tun | DeviceMode::No => "创建 TUN 失败", } } +/// 向指定虚拟网卡应用隧道 DNS 服务器。按接口别名(网卡名)通过 `netsh` +/// 设置该接口的静态 DNS 服务器列表:第 1 条为主用(`primary`),其余依次 +/// `add` 为备用。`servers` 为空表示清空接口 DNS(恢复按 DHCP/系统解析)。 +/// +/// 仅 Windows 实现(采用 netsh 而非 IP Helper API:winapi 0.3 未导出 +/// `SetInterfaceDnsSettings`,netsh 语义等价、随系统自带,无需额外依赖)。 +/// 其他平台不调用本函数:移动平台由宿主 VPN 接口(VpnService)配置 DNS, +/// 其他桌面平台为无操作。 +#[cfg(windows)] +fn apply_interface_dns(alias: &str, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + if alias.trim().is_empty() { + anyhow::bail!("虚拟网卡名为空,无法设置接口 DNS"); + } + apply_interface_dns_windows(alias, servers) +} + +#[cfg(windows)] +fn apply_interface_dns_windows(alias: &str, servers: &[Ipv4Addr]) -> anyhow::Result<()> { + use std::process::Command; + + // 清空接口 DNS(无服务器时也走这里,恢复系统解析)。 + let run = |args: &[&str]| -> anyhow::Result<()> { + let output = Command::new("netsh") + .args(args) + .output() + .map_err(|error| anyhow::anyhow!("执行 netsh 失败: {error}"))?; + if !output.status.success() { + let stderr = String::from_utf8_lossy(&output.stderr); + let stdout = String::from_utf8_lossy(&output.stdout); + anyhow::bail!("netsh {args:?} 失败: {stdout}{stderr}"); + } + Ok(()) + }; + + if servers.is_empty() { + // 恢复为 DHCP 自动获取的 DNS(清空静态配置)。 + run(&["interface", "ip", "set", "dns", alias, "dhcp"])?; + return Ok(()); + } + // 第一条:主用(会覆盖旧静态配置)。 + run(&[ + "interface", + "ip", + "set", + "dns", + alias, + "static", + &servers[0].to_string(), + "primary", + ])?; + // 其余:追加为备用(index 递增)。 + for (index, server) in servers.iter().enumerate().skip(1) { + run(&[ + "interface", + "ip", + "add", + "dns", + alias, + &server.to_string(), + &format!("index={index}"), + ])?; + } + // 刷新 DNS 缓存(失败仅记录,不影响接口建立)。 + let _ = Command::new("ipconfig").arg("/flushdns").output(); + Ok(()) +} + fn create( task_group: &TaskGroup, device: Arc, diff --git a/vnt-core/src/utils/socket.rs b/vnt-core/src/utils/socket.rs index 5a76e9c1..12ddf31b 100644 --- a/vnt-core/src/utils/socket.rs +++ b/vnt-core/src/utils/socket.rs @@ -30,16 +30,14 @@ pub(crate) fn resolve_interface(name: Option<&str>) -> anyhow::Result( "device_name": change.config.device_name, "ip": change.config.ip.as_ref().map(ToString::to_string), "mtu": change.config.mtu, + "dns_tunnel": change.config.dns_tunnel, + "dns": change.config.dns.iter().map(ToString::to_string).collect::>(), }, "routes": change.routes, "needs_vpn_rebuild": plan.vpn_rebuild, @@ -1377,6 +1379,10 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result, #[serde(default)] + dns_tunnel: bool, + #[serde(default)] + dns: Vec, + #[serde(default)] port_mapping: Vec, #[serde(default)] allow_mapping: bool, @@ -1482,6 +1488,18 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result().map_err(|error| { + anyhow::anyhow!("invalid DNS address '{}': {}", value, error) + })?); + } + let config = Config { server_addr: server_addrs, peer_address, @@ -1508,6 +1526,8 @@ fn parse_config_from_json(json_str: &str, managed: bool) -> anyhow::Result, pub mtu: Option, + /// 隧道 DNS:是否把 dns 应用到虚拟网卡接口 DNS(默认 false) + #[serde(default)] + pub dns_tunnel: bool, + /// 隧道 DNS 服务器地址列表(严格 IPv4,主备顺序) + #[serde(default)] + pub dns: Vec, #[serde(default)] pub port_mapping: Vec, #[serde(default)] @@ -805,6 +811,10 @@ struct HttpAppInfo { public_ipv4s: Vec, network_code: Option, mtu: Option, + /// 隧道 DNS 是否走隧道(当前生效配置) + dns_tunnel: bool, + /// 隧道 DNS 服务器列表(主备顺序);dns_tunnel=false 时为空 + dns: Vec, fec: Option, compress: Option, encrypt: Option, @@ -1978,6 +1988,12 @@ async fn get_info( public_ipv6: nat_info.as_ref().and_then(|v| v.ipv6), network_code: config.as_ref().map(|v| v.network_code.clone()), mtu: config.as_ref().map(|v| v.mtu.unwrap_or(DEFAULT_MTU)), + dns_tunnel: config.as_ref().is_some_and(|v| v.dns_tunnel), + dns: config + .as_ref() + .filter(|v| v.dns_tunnel) + .map(|v| v.dns.clone()) + .unwrap_or_default(), fec: config.as_ref().map(|v| v.fec), compress: config.as_ref().map(|v| v.compress), encrypt: config.as_ref().map(|v| v.password.is_some()), @@ -2563,6 +2579,19 @@ fn convert_config(cfg: StartConfig) -> anyhow::Result { x.push_str(":3478"); } } + // 隧道 DNS:解析并校验为合法 IPv4,保持主备顺序;非法地址直接报错。 + let mut dns = Vec::with_capacity(cfg.dns.len()); + for raw in &cfg.dns { + let value = raw.trim(); + if value.is_empty() { + continue; + } + dns.push( + value + .parse::() + .map_err(|error| anyhow!("invalid DNS address '{}': {}", value, error))?, + ); + } Ok(CoreConfig { server_addr: server_addrs, peer_address, @@ -2589,6 +2618,8 @@ fn convert_config(cfg: StartConfig) -> anyhow::Result { no_nat: cfg.no_nat, device_mode: cfg.device_mode, mtu: cfg.mtu, + dns_tunnel: cfg.dns_tunnel, + dns, port_mapping, allow_port_mapping: cfg.allow_mapping, udp_stun, @@ -3125,6 +3156,8 @@ config_name = "local-label" device_mode: DeviceMode::No, legacy_no_tun: None, mtu: None, + dns_tunnel: false, + dns: Vec::new(), port_mapping: Vec::new(), allow_mapping: false, udp_stun: Vec::new(), diff --git a/vnt-web/ui/src/utils/configHelp.js b/vnt-web/ui/src/utils/configHelp.js index fa0dde09..673d2a44 100644 --- a/vnt-web/ui/src/utils/configHelp.js +++ b/vnt-web/ui/src/utils/configHelp.js @@ -68,6 +68,19 @@ export const configHelp = { format: "正整数,常用范围 1200–1500;留空使用默认值。", example: "1380", }, + dns_tunnel: { + param: "dns_tunnel", + summary: "是否把下方 dns 服务器应用到虚拟网卡接口 DNS(隧道 DNS 总开关)。", + usage: "开启后,隧道内走系统 DNS 的应用统一使用下方 DNS:可规避运营商 DNS 污染,或统一走 VNT 对端(如路由器)的 DNS。关闭则沿用物理网卡/系统 DNS(默认关闭)。", + format: "布尔开关;默认关闭。", + }, + dns: { + param: "dns", + summary: "隧道 DNS 服务器地址列表(主备顺序)。", + usage: "仅在 dns_tunnel=true 时生效:按顺序写入虚拟网卡接口 DNS,第 1 条主用、其余备用。建议填 VNT 对端(路由器)的隧道 IP(如 10.26.0.3);多条实现主备兜底。", + format: "IPv4 点分十进制地址数组;每条 0–255,非法地址保存时会被拒绝。", + example: '["10.26.0.3", "223.5.5.5"]', + }, tunnel_addr: { param: "tunnel_addr / --tunnel-addr", summary: "指定本机监听 P2P 隧道的 IP 和端口。", diff --git a/vnt-web/ui/src/utils/toml.js b/vnt-web/ui/src/utils/toml.js index bcb66b29..84c4673e 100644 --- a/vnt-web/ui/src/utils/toml.js +++ b/vnt-web/ui/src/utils/toml.js @@ -10,6 +10,8 @@ export const emptyFormData = () => ({ punch_model: [], ip: "", mtu: null, + dns_tunnel: false, + dns: [], rtx: false, fec: false, compress: false, @@ -85,6 +87,14 @@ export const parseTomlToForm = (toml) => { } else if (trimmed.includes("ip =")) { const match = trimmed.match(/ip\s*=\s*"([^"]*)"/); if (match) data.ip = match[1]; + } else if (trimmed.match(/^dns_tunnel\s*=/)) { + data.dns_tunnel = trimmed.includes("true"); + } else if (trimmed.startsWith("dns")) { + const match = trimmed.match(/dns\s*=\s*\[(.*)\]/); + if (match) { + const items = match[1].match(/"([^"]*)"/g); + if (items) data.dns = items.map((s) => s.replace(/"/g, "")); + } } else if (trimmed.includes("mtu =")) { const match = trimmed.match(/mtu\s*=\s*(\d+)/); if (match) data.mtu = parseInt(match[1]); @@ -350,6 +360,18 @@ export const formToToml = (formData) => { toml += `mtu = ${formData.mtu}\n`; } + // 隧道 DNS:仅在非默认时写入(dns_tunnel 默认 false、dns 默认空)。 + const dnsServers = (formData.dns || []).map((s) => (s || "").trim()).filter(Boolean); + if (formData.dns_tunnel) { + toml += "\n# 隧道 DNS:是否把下方 dns 应用到虚拟网卡接口 DNS(默认 false)\n"; + toml += "# 第 1 条主用,其余备用;建议填 VNT 对端(路由器)隧道 IP,例如 10.26.0.3\n"; + toml += "dns_tunnel = true\n"; + } + if (dnsServers.length > 0) { + toml += `\n# 隧道 DNS 服务器列表(严格 IPv4,主备顺序)\n`; + toml += `dns = [${dnsServers.map((s) => `"${s}"`).join(", ")}]\n`; + } + toml += "\n# --- 设备配置 ---\n"; if (formData.device_name) { toml += "\n# 设备名称 (可选,默认读取本机 hostname)\n"; @@ -489,6 +511,11 @@ device_mode = "tun" # MTU 设置 # mtu = 1400 +# 隧道 DNS:是否把下方 dns 应用到虚拟网卡接口 DNS(默认 false,关闭则沿用系统 DNS) +# 开启后 dns 列表写入虚拟网卡接口:第 1 条主用,其余备用;建议填 VNT 对端(路由器)隧道 IP +# dns_tunnel = false +# dns = ["10.26.0.3", "223.5.5.5"] + # --- 设备配置 --- # 设备名称 (可选,默认读取本机 hostname) diff --git a/vnt-web/ui/src/views/ConfigEditor.vue b/vnt-web/ui/src/views/ConfigEditor.vue index e2f6a26d..70f9357e 100644 --- a/vnt-web/ui/src/views/ConfigEditor.vue +++ b/vnt-web/ui/src/views/ConfigEditor.vue @@ -60,6 +60,9 @@ const toggleSection = (key) => { // 打开编辑器时重置折叠状态;已有数据的分区自动展开,避免配置被藏起来 const resetSections = (data) => { sectionExpanded.value = { ...DEFAULT_SECTIONS }; + // 隧道 DNS:至少保留一行可编辑地址(列表为空时补一行空地址) + if (!Array.isArray(data.dns)) data.dns = []; + if (data.dns.length === 0) data.dns = [""]; if ( data.input.length || data.output.length || @@ -219,6 +222,16 @@ const handleSave = async () => { ui.toast.error("配置多个服务器时必须填写虚拟 IP"); return; } + // 隧道 DNS 校验:开启总开关时,非空地址必须是合法 IPv4 + if (formData.value.dns_tunnel) { + const invalid = (formData.value.dns || []) + .map((s) => (s || "").trim()) + .filter((s) => s && !isValidIpv4(s)); + if (invalid.length > 0) { + ui.toast.error("DNS 地址无效(需为 IPv4):" + invalid.join(", ")); + return; + } + } configContent = formToToml(formData.value); } @@ -240,6 +253,34 @@ const removeBtnClass = "shrink-0 rounded-lg bg-red-50 px-3 py-2 text-red-500 transition-colors hover:bg-red-100 dark:bg-red-900/20 dark:text-red-500 dark:hover:bg-red-900/40"; const addBtnClass = "flex w-full items-center justify-center gap-1 rounded-lg bg-slate-100 px-3 py-2 text-sm text-slate-600 transition-colors hover:bg-slate-200 dark:bg-slate-700/50 dark:text-slate-300 dark:hover:bg-slate-700"; + +// 隧道 DNS:严格的点分十进制 IPv4 校验(四段、每段 0-255、无前导空段)。 +const isValidIpv4 = (value) => { + if (typeof value !== "string") return false; + const parts = value.trim().split("."); + if (parts.length !== 4) return false; + return parts.every( + (p) => p.length >= 1 && p.length <= 3 && /^\d+$/.test(p) && Number(p) >= 0 && Number(p) <= 255, + ); +}; +// DNS 输入框引用,用于新增行后自动聚焦 +const dnsInputRefs = ref([]); +const setDnsInputRef = (el, index) => { + if (el) dnsInputRefs.value[index] = el; +}; +const addDns = () => { + if (!Array.isArray(formData.value.dns)) formData.value.dns = []; + if (!formData.value.dns_tunnel) formData.value.dns_tunnel = true; + formData.value.dns.push(""); + nextTick(() => { + const el = dnsInputRefs.value[formData.value.dns.length - 1]; + if (el && el.focus) el.focus(); + }); +}; +const removeDns = (index) => { + if (formData.value.dns.length <= 1) return; + formData.value.dns.splice(index, 1); +}; const sectionTitleClass = "text-md flex items-center font-bold text-slate-900 dark:text-white"; const sectionChevronClass = (expanded) => `h-5 w-5 shrink-0 text-slate-400 transition-transform duration-200 ${expanded ? "rotate-180" : ""}`; @@ -586,6 +627,68 @@ const sectionChevronClass = (expanded) => + + +
+
+ + + + 隧道 DNS + +
+ + + +
+
+ + 第一行主用,其余备用 +
+
+
+ {{ index === 0 ? '主' : '备' }} + + +
+
+ +

+ + + + 建议填 VNT 对端(路由器)的隧道 IP,例如 10.26.0.3;多条按顺序主备兜底。需为合法 IPv4 地址。 +

+
+
diff --git a/vnt-web/ui/src/views/DashboardView.vue b/vnt-web/ui/src/views/DashboardView.vue index 3f41e674..549f2062 100644 --- a/vnt-web/ui/src/views/DashboardView.vue +++ b/vnt-web/ui/src/views/DashboardView.vue @@ -30,6 +30,15 @@ const tunnelListenAddresses = computed(() => { return [...new Set(addrs.map((item) => item.address))]; }); +// 隧道 DNS 摘要:走隧道时按顺序列出(首条主用、其余备用);关闭或为空显示系统 DNS +const dnsSummary = computed(() => { + const info = app.selectedInfo; + if (!info || !info.dns_tunnel) return "系统 DNS(未走隧道)"; + const values = (info.dns || []).map((s) => String(s).trim()).filter(Boolean); + if (values.length === 0) return "系统 DNS(未配置隧道 DNS)"; + return values.map((v, i) => v + (i === 0 ? "(主)" : "(备)")).join("\n"); +}); +