diff --git a/crates/shadowsocks/src/dns_resolver/resolver.rs b/crates/shadowsocks/src/dns_resolver/resolver.rs index bd0c4661..620e55b8 100644 --- a/crates/shadowsocks/src/dns_resolver/resolver.rs +++ b/crates/shadowsocks/src/dns_resolver/resolver.rs @@ -196,7 +196,7 @@ async fn trust_dns_notify_update_dns(resolver: Arc) -> n // Update once for all those Modify events time::sleep(Duration::from_secs(1)).await; - match create_resolver(None, resolver.dns_cache_size.clone(), resolver.connect_opts.clone()).await { + match create_resolver(None, resolver.dns_cache_size, resolver.connect_opts.clone()).await { Ok(r) => { debug!("auto-reload {DNS_RESOLV_FILE_PATH}"); @@ -230,7 +230,7 @@ impl DnsResolver { pub async fn trust_dns_system_resolver(dns_cache_size: Option, connect_opts: ConnectOpts) -> io::Result { use super::trust_dns_resolver::create_resolver; - let resolver = create_resolver(None, dns_cache_size.clone(), connect_opts.clone()).await?; + let resolver = create_resolver(None, dns_cache_size, connect_opts.clone()).await?; let inner = Arc::new(TrustDnsSystemResolver { resolver: ArcSwap::from(Arc::new(resolver)), diff --git a/crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs b/crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs index eb1ff81c..eb5ad474 100644 --- a/crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs +++ b/crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs @@ -108,10 +108,7 @@ pub async fn create_resolver(dns: Option, dns_cache_size: Option // Since we want to use Happy Eyeballs to connect to both IPv4 and IPv6 addresses, we need both A and AAAA records. resolver_opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6; - match dns_cache_size { - Some(size) => resolver_opts.cache_size = size, - None => {}, - } + if let Some(size) = dns_cache_size { resolver_opts.cache_size = size } trace!( "initializing DNS resolver with config {:?} opts {:?}",