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
90 changes: 90 additions & 0 deletions src/args_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ pub struct FileConfig {
#[serde(rename = "no_tun", skip_serializing)]
pub legacy_no_tun: Option<bool>,
pub mtu: Option<u16>,
/// 隧道 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 +100,7 @@ impl FileConfig {
device_mode,
legacy_no_tun,
mtu,
dns,
ctrl_port,
port_mapping,
allow_mapping,
Expand Down Expand Up @@ -271,6 +274,9 @@ pub struct Args {
/// 设置mtu
#[clap(long)]
pub mtu: Option<u16>,
/// 隧道 DNS 服务器地址,可重复指定;第 1 条主用,其余备用(仅 IPv4)
#[clap(long = "dns")]
pub dns: Vec<String>,
/// 控制端口,设置0时禁用控制服务
#[clap(long)]
pub ctrl_port: Option<u16>,
Expand Down Expand Up @@ -436,6 +442,13 @@ 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: 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 +503,7 @@ 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: 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 +583,7 @@ 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: 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 +599,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 +750,11 @@ server = ["quic://1.2.3.4:29872"]
# MTU 设置
# mtu = 1400

# 网卡 DNS:非空列表会写入虚拟网卡接口 DNS,留空或省略则使用系统 DNS。
# 第 1 条主用,其余备用。
# 建议填 VNT 对端(路由器)的隧道 IP,例如 10.26.0.3;每条必须是合法 IPv4。
# dns = ["10.26.0.3", "223.5.5.5"]

# --- 设备配置 ---

# 设备名称 (可选,默认读取本机 hostname)
Expand Down Expand Up @@ -774,6 +811,59 @@ server = ["quic://1.2.3.4:29872"]
mod tests {
use super::*;

#[test]
fn dns_list_alone_configures_interface_dns() {
let args = Args::try_parse_from([
"vnt",
"-n",
"dns-test",
"--device-id",
"dns-test-device",
"--dns",
"10.26.0.3",
"--dns",
"223.5.5.5",
])
.unwrap();
let (config, _) = build_from_args_only(args).unwrap();
assert_eq!(
config.dns,
vec![
"10.26.0.3".parse::<std::net::Ipv4Addr>().unwrap(),
"223.5.5.5".parse().unwrap(),
]
);
let file: FileConfig = toml::from_str(
"network_code='dns-test'\ndevice_id='dns-test-device'\nip='10.26.0.2/24'\ndns=[]",
)
.unwrap();
assert!(build_from_file_only(file).unwrap().0.dns.is_empty());
}

#[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=['10.26.0.3']",
)
.unwrap();
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
34 changes: 34 additions & 0 deletions vnt-core/src/context/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,9 @@ pub struct Config {
pub no_nat: bool,
pub device_mode: DeviceMode,
pub mtu: Option<u16>,
/// 隧道 DNS 服务器地址列表(严格 IPv4 点分十进制),按顺序即主备顺序,
/// 第 1 条为主用,其余为备用;为空时使用系统 DNS。
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 +710,8 @@ impl Config {
if let Some(mtu) = self.mtu {
table.insert("mtu".into(), i64::from(mtu).into());
}
// 空列表使用系统 DNS,无需输出。
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 +1309,36 @@ 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_dns_without_a_separate_switch() {
let config = Config {
network_code: "net".to_string(),
device_id: "dev".to_string(),
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"), "{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_to_system_dns() {
let config = Config::default();
assert!(config.dns.is_empty());
}
}
63 changes: 59 additions & 4 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 != self.config.dns
|| (self.device_mode().has_device() && self.device_io_manager.dns_update_pending());
#[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 @@ -259,6 +266,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,恢复系统解析。
if let Err(error) = self.device_io_manager.set_dns(&change.config.dns).await {
log::warn!("应用隧道 DNS 失败,保留待重试状态: {error:#}");
}
// 网卡名热更新: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 +337,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(change.config.dns.clone());
Ok(config)
}

Expand Down Expand Up @@ -575,6 +588,7 @@ 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 != self.config.dns
|| normalized_routes(self.app_state.subnet_route.applied_routes())
!= normalized_routes(change.routes.clone())
}
Expand Down Expand Up @@ -607,7 +621,7 @@ impl NetworkManager {
(desired, address)
}

/// 提交路由快照,并把配置中影响路由的字段(`ip`、`input`)应用到实例。
/// 提交路由与 DNS 快照,并发布当前配置,供桌面和移动平台共用。
fn commit_runtime_snapshot(&mut self, change: &RuntimeChange) {
self.app_state
.subnet_route
Expand All @@ -618,8 +632,10 @@ impl NetworkManager {
self.app_state
.subnet_route
.set_route_table(change.config.input.clone());
self.app_state.set_config(self.config.clone());
}
self.config.dns = change.config.dns.clone();
// DNS 单独变化时也必须更新 API 读取的共享配置。
self.app_state.set_config(self.config.clone());
}
}

Expand Down Expand Up @@ -686,13 +702,52 @@ 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 != target.dns
}

#[cfg(test)]
mod tests {
use super::*;

#[tokio::test]
async fn committed_dns_snapshot_does_not_require_another_device_rebuild() {
let owner = crate::utils::task_control::TaskGroupManager::new();
let (group, _guard) = owner.create_task().unwrap();
let (routes, _receiver) = tokio::sync::watch::channel(Vec::new());
let mut manager = NetworkManager::create_network(
Box::new(Config {
network_code: "dns-snapshot-test".to_string(),
device_id: "dns-snapshot-device".to_string(),
device_mode: crate::context::config::DeviceMode::Tun,
ip: Some("10.26.0.2/24".parse().unwrap()),
..Config::default()
}),
group,
std::sync::Arc::new(crate::log_manager::InstanceLog::new("dns-snapshot-test")),
routes,
)
.await
.unwrap();
let mut change = RuntimeChange {
config: (*manager.config).clone(),
routes: Vec::new(),
};
change.config.dns = vec!["10.26.0.3".parse().unwrap()];
assert!(device_restart_fields_differ(
&manager.config,
&change.config
));
manager.commit_runtime_snapshot(&change);
assert!(!device_restart_fields_differ(
&manager.config,
&change.config
));
assert_eq!(manager.config.dns, change.config.dns);
manager.stop().await;
}

#[test]
fn policy_field_changes_are_detected() {
let current = Config::default();
Expand Down
40 changes: 40 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(self.config.dns.clone());
// 失败时 tun_receiver/enhanced_outbound 不会被消耗,可以重试
if let Err(e) = self
.device_io_manager
Expand Down Expand Up @@ -789,6 +791,14 @@ impl NetworkManager {
.await?;
#[cfg(not(any(target_os = "ios", target_os = "tvos")))]
self.device_io_manager.apply_system_routes(routes).await;
#[cfg(not(any(target_os = "android", target_os = "ios", target_os = "tvos")))]
if let Err(error) = self
.device_io_manager
.set_dns(&self.config.dns)
.await
{
log::warn!("应用隧道 DNS 失败,保留待重试状态: {error:#}");
}
}
Ok(())
}
Expand Down Expand Up @@ -884,6 +894,36 @@ mod inspect_change_tests {
}
}

#[tokio::test]
async fn dns_only_changes_publish_current_config() {
let mut config = standalone_config();
let mut manager = RuntimeChangeManager::new(
config.clone(),
None,
Arc::new(InstanceLog::new("dns-change-test")),
)
.await
.unwrap();
for addresses in [
vec!["10.26.0.3", "223.5.5.5"],
vec!["10.26.0.4"],
vec![],
] {
config.dns = addresses
.iter()
.map(|address| address.parse().unwrap())
.collect();
let change = RuntimeChange {
config: config.clone(),
routes: Vec::new(),
};
manager.apply_change(&change).await.unwrap();
let published = manager.api().unwrap().get_config().unwrap();
assert_eq!(published.dns, config.dns);
}
manager.stop().await;
}

#[tokio::test]
async fn identical_snapshot_needs_nothing_and_password_flags_rebuild() {
let config = standalone_config();
Expand Down
Loading
Loading