Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions src/args_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ pub struct FileConfig {
#[serde(rename = "no_tun", skip_serializing)]
pub legacy_no_tun: Option<bool>,
pub mtu: Option<u16>,
/// 隧道 DNS:是否把 dns 应用到虚拟网卡接口 DNS(默认 false)
pub dns_tunnel: Option<bool>,
/// 隧道 DNS 服务器地址列表(严格 IPv4,主备顺序)
pub dns: Option<Vec<String>>,
pub ctrl_port: Option<u16>,
pub port_mapping: Option<Vec<String>>,
pub allow_mapping: Option<bool>,
Expand Down Expand Up @@ -98,6 +102,8 @@ impl FileConfig {
device_mode,
legacy_no_tun,
mtu,
dns_tunnel,
dns,
ctrl_port,
port_mapping,
allow_mapping,
Expand Down Expand Up @@ -271,6 +277,12 @@ pub struct Args {
/// 设置mtu
#[clap(long)]
pub mtu: Option<u16>,
/// DNS 是否走隧道(把 dns 应用到虚拟网卡接口 DNS,默认关闭)
#[clap(long)]
pub dns_tunnel: bool,
/// 隧道 DNS 服务器地址,可重复指定;第 1 条主用,其余备用(仅 IPv4)
#[clap(long = "dns")]
pub dns: Vec<String>,
/// 控制端口,设置0时禁用控制服务
#[clap(long)]
pub ctrl_port: Option<u16>,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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<String>) -> anyhow::Result<Vec<std::net::Ipv4Addr>> {
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::<std::net::Ipv4Addr>().map_err(|error| {
anyhow::anyhow!("DNS 地址无效:{value}(需为 IPv4 点分十进制):{error}")
})?;
servers.push(ip);
}
Ok(servers)
}

fn resolve_tunnel_binding(
cli_addr: &[SocketAddr],
cli_port: Option<u16>,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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::<std::net::Ipv4Addr>().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();
Expand Down
43 changes: 43 additions & 0 deletions vnt-core/src/context/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,12 @@ pub struct Config {
pub no_nat: bool,
pub device_mode: DeviceMode,
pub mtu: Option<u16>,
/// 隧道 DNS:是否把 `dns` 中的服务器应用到虚拟网卡接口 DNS。默认关闭,
/// 关闭时不注入任何隧道 DNS,沿用物理网卡/系统 DNS。
pub dns_tunnel: bool,
/// 隧道 DNS 服务器地址列表(严格 IPv4 点分十进制),按顺序即主备顺序,
/// 第 1 条为主用,其余为备用。仅在 `dns_tunnel=true` 时生效。
pub dns: Vec<Ipv4Addr>,
pub port_mapping: Vec<PortMapping>,
pub allow_port_mapping: bool,
pub udp_stun: Vec<String>,
Expand Down Expand Up @@ -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());
}
Expand Down Expand Up @@ -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::<toml::Table>(&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::<toml::Table>(&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());
}
}
43 changes: 41 additions & 2 deletions vnt-core/src/core/change_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,21 @@ 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"))]
let name_change =
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、
Expand Down Expand Up @@ -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 {
// 网关是注册时确定的虚拟网络属性,不随快照重算,沿用当前注册值
Expand All @@ -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 {
Expand Down Expand Up @@ -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)
}

Expand Down Expand Up @@ -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())
}
Expand Down Expand Up @@ -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<std::net::Ipv4Addr> {
if config.dns_tunnel {
config.dns.clone()
} else {
Vec::new()
}
}

#[cfg(test)]
Expand Down
2 changes: 2 additions & 0 deletions vnt-core/src/core/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions vnt-core/src/network_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading