ospab
/
ostp
mirror of https://github.com/ospab/ostp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(client): prefer IPv6 on Android to support NAT64 mobile networks

This commit is contained in:
ospab 2026-05-28 18:51:30 +03:00
parent eeabd3889b
commit 7fba4b8aa0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ostp-client/src/runner.rs
View File

@ -157,11 +157,15 @@ pub async fn run_client_core(
// Resolve the server IP before we override system routing and DNS. // Resolve the server IP before we override system routing and DNS.
// This prevents DNS deadlock if the VPN disconnects and tries to reconnect, // This prevents DNS deadlock if the VPN disconnects and tries to reconnect,
// and also ensures we add the direct route to the exact IP the bridge connects to. // and also ensures we add the direct route to the exact IP the bridge connects to.
let resolved_addrs: Vec<std::net::SocketAddr> = tokio::net::lookup_host(&config.ostp.server_addr) #[allow(unused_mut)]
let mut resolved_addrs: Vec<std::net::SocketAddr> = tokio::net::lookup_host(&config.ostp.server_addr)
.await .await
.map_err(|e| anyhow::anyhow!("Failed to resolve server address {}: {}", config.ostp.server_addr, e))? .map_err(|e| anyhow::anyhow!("Failed to resolve server address {}: {}", config.ostp.server_addr, e))?
.collect(); .collect();
#[cfg(target_os = "android")]
resolved_addrs.sort_by_key(|addr| if addr.is_ipv6() { 0 } else { 1 });
let target_addr = resolved_addrs.first() let target_addr = resolved_addrs.first()
.ok_or_else(|| anyhow::anyhow!("No IP addresses resolved for {}", config.ostp.server_addr))?; .ok_or_else(|| anyhow::anyhow!("No IP addresses resolved for {}", config.ostp.server_addr))?;