Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable happy eyeballs when using hickory-dns #2378

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Enable happy eyeballs when using hickory-dns #2378

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18cdab6
Enable happy eyeballs when using `hickory-dns`
zeling Aug 11, 2024
721d75d
cargo fmt
zeling Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/dns/hickory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//! DNS resolution via the [hickory-resolver](https://github.com/hickory-dns/hickory-dns) crate

use hickory_resolver::{lookup_ip::LookupIpIntoIter, system_conf, TokioAsyncResolver};
use hickory_resolver::{
config::LookupIpStrategy, lookup_ip::LookupIpIntoIter, system_conf, TokioAsyncResolver,
};
use once_cell::sync::OnceCell;

use std::io;
Expand Down Expand Up @@ -46,13 +48,16 @@ impl Iterator for SocketAddrs {
}

/// Create a new resolver with the default configuration,
/// which reads from `/etc/resolve.conf`.
/// which reads from `/etc/resolve.conf`. The options are
/// overriden to look up for both IPv4 and IPv6 addresses
/// to work with "happy eyeballs" algorithm.
fn new_resolver() -> io::Result<TokioAsyncResolver> {
let (config, opts) = system_conf::read_system_conf().map_err(|e| {
let (config, mut opts) = system_conf::read_system_conf().map_err(|e| {
io::Error::new(
io::ErrorKind::Other,
format!("error reading DNS system conf: {e}"),
)
})?;
opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6;
Ok(TokioAsyncResolver::tokio(config, opts))
}