suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 21:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

use random ip from dns record instead of only first one

Browse Source
This commit is contained in:
sijie.sun
2024-08-04 23:10:31 +08:00
committed by Sijie.Sun
parent 2415cb211e
commit b4fbcd8d80
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
easytier/src/connector/manual.rs
View File

@@ -316,6 +316,7 @@ impl ManualConnectorManager {
ip_versions.push(IpVersion::Both); ip_versions.push(IpVersion::Both);
} else { } else {
let addrs = u.socket_addrs(|| Some(1000))?; let addrs = u.socket_addrs(|| Some(1000))?;
tracing::info!(?addrs, ?dead_url, "get ip from url done");
let mut has_ipv4 = false; let mut has_ipv4 = false;
let mut has_ipv6 = false; let mut has_ipv6 = false;
for addr in addrs { for addr in addrs {

10
easytier/src/tunnel/mod.rs
View File

@@ -205,7 +205,7 @@ impl FromUrl for SocketAddr {
fn from_url(url: url::Url, ip_version: IpVersion) -> Result<Self, TunnelError> { fn from_url(url: url::Url, ip_version: IpVersion) -> Result<Self, TunnelError> {
let addrs = url.socket_addrs(|| None)?; let addrs = url.socket_addrs(|| None)?;
tracing::debug!(?addrs, ?ip_version, ?url, "convert url to socket addrs"); tracing::debug!(?addrs, ?ip_version, ?url, "convert url to socket addrs");
let mut addrs = addrs let addrs = addrs
.into_iter() .into_iter()
.filter(|addr| match ip_version { .filter(|addr| match ip_version {
IpVersion::V4 => addr.is_ipv4(), IpVersion::V4 => addr.is_ipv4(),
@@ -213,7 +213,13 @@ impl FromUrl for SocketAddr {
IpVersion::Both => true, IpVersion::Both => true,
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
addrs.pop().ok_or(TunnelError::NoDnsRecordFound(ip_version))
use rand::seq::SliceRandom;
// randomly select one address
addrs
.choose(&mut rand::thread_rng())
.copied()
.ok_or(TunnelError::NoDnsRecordFound(ip_version))
} }
} }