bump hickory-dns version to v0.25.2 (#839)

easytier/src/common/stun.rs

@@ -8,8 +8,10 @@ use crate::proto::common::{NatType, StunInfo};
 use anyhow::Context;
 use chrono::Local;
 use crossbeam::atomic::AtomicCell;
-use hickory_resolver::config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts};
-use hickory_resolver::TokioAsyncResolver;
+use hickory_proto::xfer::Protocol;
+use hickory_resolver::config::{NameServerConfig, ResolverConfig};
+use hickory_resolver::name_server::TokioConnectionProvider;
+use hickory_resolver::TokioResolver;
 use rand::seq::IteratorRandom;
 use tokio::net::{lookup_host, UdpSocket};
 use tokio::sync::{broadcast, Mutex};
@@ -39,7 +41,7 @@ pub fn get_default_resolver_config() -> ResolverConfig {
 
 pub async fn resolve_txt_record(
     domain_name: &str,
-    resolver: &TokioAsyncResolver,
+    resolver: &TokioResolver,
 ) -> Result<String, Error> {
     let response = resolver.txt_lookup(domain_name).await.with_context(|| {
         format!(
@@ -79,9 +81,12 @@ impl HostResolverIter {
     }
 
     async fn get_txt_record(domain_name: &str) -> Result<Vec<String>, Error> {
-        let resolver = TokioAsyncResolver::tokio_from_system_conf().unwrap_or(
-            TokioAsyncResolver::tokio(get_default_resolver_config(), ResolverOpts::default()),
-        );
+        let resolver = TokioResolver::builder_tokio()
+            .unwrap_or(TokioResolver::builder_with_config(
+                get_default_resolver_config(),
+                TokioConnectionProvider::default(),
+            ))
+            .build();
         let txt_data = resolve_txt_record(domain_name, &resolver).await?;
         Ok(txt_data.split(" ").map(|x| x.to_string()).collect())
     }

easytier/src/connector/dns_connector.rs

@@ -11,9 +11,7 @@ use crate::{
 use anyhow::Context;
 use dashmap::DashSet;
 use hickory_resolver::{
-    config::{ResolverConfig, ResolverOpts},
-    proto::rr::rdata::SRV,
-    TokioAsyncResolver,
+    name_server::TokioConnectionProvider, proto::rr::rdata::SRV, TokioResolver,
 };
 use rand::{seq::SliceRandom, Rng as _};
 
@@ -43,9 +41,6 @@ pub struct DNSTunnelConnector {
     bind_addrs: Vec<SocketAddr>,
     global_ctx: ArcGlobalCtx,
     ip_version: IpVersion,
-
-    default_resolve_config: ResolverConfig,
-    default_resolve_opts: ResolverOpts,
 }
 
 impl DNSTunnelConnector {
@@ -55,9 +50,6 @@ impl DNSTunnelConnector {
             bind_addrs: Vec::new(),
             global_ctx,
             ip_version: IpVersion::Both,
-
-            default_resolve_config: get_default_resolver_config(),
-            default_resolve_opts: ResolverOpts::default(),
         }
     }
 
@@ -66,11 +58,13 @@ impl DNSTunnelConnector {
         &self,
         domain_name: &str,
     ) -> Result<Box<dyn TunnelConnector>, Error> {
-        let resolver =
-            TokioAsyncResolver::tokio_from_system_conf().unwrap_or(TokioAsyncResolver::tokio(
-                self.default_resolve_config.clone(),
-                self.default_resolve_opts.clone(),
-            ));
+        let resolver = TokioResolver::builder_tokio()
+            .unwrap_or(TokioResolver::builder_with_config(
+                get_default_resolver_config(),
+                TokioConnectionProvider::default(),
+            ))
+            .build();
+
         let txt_data = resolve_txt_record(domain_name, &resolver)
             .await
             .with_context(|| format!("resolve txt record failed, domain_name: {}", domain_name))?;
@@ -126,11 +120,12 @@ impl DNSTunnelConnector {
     ) -> Result<Box<dyn TunnelConnector>, Error> {
         tracing::info!("handle_srv_record: {}", domain_name);
 
-        let resolver =
-            TokioAsyncResolver::tokio_from_system_conf().unwrap_or(TokioAsyncResolver::tokio(
-                self.default_resolve_config.clone(),
-                self.default_resolve_opts.clone(),
-            ));
+        let resolver = TokioResolver::builder_tokio()
+            .unwrap_or(TokioResolver::builder_with_config(
+                get_default_resolver_config(),
+                TokioConnectionProvider::default(),
+            ))
+            .build();
 
         let srv_domains = PROTO_PORT_OFFSET
             .iter()