Skip to content

Commit 47d1989

Browse files
Update hickory-resolver 0.24.2 -> 0.25.2 (#386)
Update hickory-resolver to the latest version. CC @ZettaScript
1 parent 6d61e2b commit 47d1989

File tree

3 files changed

+203
-31
lines changed

3 files changed

+203
-31
lines changed

Cargo.lock

Lines changed: 183 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ tokio-stream = "0.1.12"
4141
tokio-util = { version = "0.7.15", features = ["compat", "io", "codec"] }
4242
tokio = { version = "1.44.2", features = ["rt", "net", "io-util", "time", "macros", "sync", "parking_lot"] }
4343
tracing = { version = "0.1.40", features = ["log"] }
44-
hickory-resolver = "0.24.2"
44+
hickory-resolver = "0.25.2"
4545
uint = "0.10.0"
4646
unsigned-varint = { version = "0.8.0", features = ["codec"] }
4747
url = "2.5.4"

src/transport/common/listener.rs

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ use crate::{
2727

2828
use futures::Stream;
2929
use hickory_resolver::{
30-
config::{ResolverConfig, ResolverOpts},
31-
TokioAsyncResolver,
30+
config::ResolverConfig, name_server::TokioConnectionProvider, TokioResolver,
3231
};
3332
use multiaddr::{Multiaddr, Protocol};
3433
use network_interface::{Addr, NetworkInterface, NetworkInterfaceConfig};
@@ -84,23 +83,25 @@ impl AddressType {
8483
} => (address, port, dns_type),
8584
};
8685

87-
let lookup =
88-
match TokioAsyncResolver::tokio(ResolverConfig::default(), ResolverOpts::default())
89-
.lookup_ip(url.clone())
90-
.await
91-
{
92-
Ok(lookup) => lookup,
93-
Err(error) => {
94-
tracing::debug!(
95-
target: LOG_TARGET,
96-
?error,
97-
"failed to resolve DNS address `{}`",
98-
url
99-
);
86+
let resolver = TokioResolver::builder_with_config(
87+
ResolverConfig::default(),
88+
TokioConnectionProvider::default(),
89+
)
90+
.build();
10091

101-
return Err(DnsError::ResolveError(url));
102-
}
103-
};
92+
let lookup = match resolver.lookup_ip(url.clone()).await {
93+
Ok(lookup) => lookup,
94+
Err(error) => {
95+
tracing::debug!(
96+
target: LOG_TARGET,
97+
?error,
98+
"failed to resolve DNS address `{}`",
99+
url
100+
);
101+
102+
return Err(DnsError::ResolveError(url));
103+
}
104+
};
104105

105106
let Some(ip) = lookup.iter().find(|ip| match dns_type {
106107
DnsType::Dns => true,

0 commit comments

Comments
 (0)