[PR #3019] [MERGED] resolver: refactor name server configuration #3497

New issue

Closed

opened 2026-03-16 11:46:53 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:46:53 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/3019
Author: @djc
Created: 5/28/2025
Status: ✅ Merged
Merged: 5/29/2025
Merged by: @djc

Base: main ← Head: resolver-config

📝 Commits (10+)

65a92d8 resolver: re-order NameServerConfigGroup impls
fc9682a resolver: move ResolverOpts before simple enums
38cec55 resolver: move NameServerConfig after NameServerConfigGroup
68f4a5e resolver: drop NameServerConfigGroup::new() in favor of Default impl
44e155d resolver: replace opinionated Default impl for ResolverConfig
d6386fb resolver: drop Display impl for NameServerConfig
632f3f8 proto: QUIC and H3 are not datagram protocols
4442572 proto: re-order Protocol impls
eedfd6d proto: drop Default impl for Protocol
0080b6c resolver: introduce ProtocolConfig

📊 Changes

34 files changed (+462 additions, -510 deletions)

View changed files

📝 bin/src/lib.rs (+2 -2)
📝 bin/tests/integration/config_tests.rs (+7 -0)
📝 bin/tests/integration/named_https_tests.rs (+1 -1)
📝 bin/tests/integration/named_quic_tests.rs (+1 -1)
📝 bin/tests/integration/named_rustls_tests.rs (+8 -4)
📝 conformance/packages/dns-test/src/templates/hickory.forwarder.toml.jinja (+1 -1)
📝 crates/proto/src/h2/h2_client_stream.rs (+22 -20)
📝 crates/proto/src/h3/h3_client_stream.rs (+34 -37)
📝 crates/proto/src/quic/quic_client_stream.rs (+17 -21)
📝 crates/proto/src/quic/tests.rs (+2 -4)
📝 crates/proto/src/rustls/tls_client_stream.rs (+7 -8)
📝 crates/proto/src/rustls/tls_stream.rs (+17 -16)
📝 crates/proto/src/xfer/mod.rs (+15 -36)
📝 crates/recursor/src/recursor_dns_handle.rs (+1 -1)
📝 crates/resolver/src/config.rs (+187 -201)
📝 crates/resolver/src/h2.rs (+4 -4)
📝 crates/resolver/src/h3.rs (+3 -3)
📝 crates/resolver/src/lib.rs (+1 -1)
📝 crates/resolver/src/name_server/connection_provider.rs (+34 -31)
📝 crates/resolver/src/name_server/name_server.rs (+5 -8)

...and 14 more files

📄 Description

This is eventually in service of https://github.com/hickory-dns/hickory-dns/issues/2738.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/3019 **Author:** [@djc](https://github.com/djc) **Created:** 5/28/2025 **Status:** ✅ Merged **Merged:** 5/29/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `resolver-config` --- ### 📝 Commits (10+) - [`65a92d8`](https://github.com/hickory-dns/hickory-dns/commit/65a92d810b89306169b406f36414270b107dafa5) resolver: re-order NameServerConfigGroup impls - [`fc9682a`](https://github.com/hickory-dns/hickory-dns/commit/fc9682a45a7c8999cb11e9bcd55bb8eb9701d314) resolver: move ResolverOpts before simple enums - [`38cec55`](https://github.com/hickory-dns/hickory-dns/commit/38cec552c524acb97fb43781398490c3d7297e15) resolver: move NameServerConfig after NameServerConfigGroup - [`68f4a5e`](https://github.com/hickory-dns/hickory-dns/commit/68f4a5e7bc096fa8a77c47d0fcf03c035a390d2c) resolver: drop NameServerConfigGroup::new() in favor of Default impl - [`44e155d`](https://github.com/hickory-dns/hickory-dns/commit/44e155def4ed6e4e81ced5efc7ee750b08219c21) resolver: replace opinionated Default impl for ResolverConfig - [`d6386fb`](https://github.com/hickory-dns/hickory-dns/commit/d6386fbc69409cdce8216be4364289865e09dd64) resolver: drop Display impl for NameServerConfig - [`632f3f8`](https://github.com/hickory-dns/hickory-dns/commit/632f3f87721f252473f46c65bab07904241ef8dc) proto: QUIC and H3 are not datagram protocols - [`4442572`](https://github.com/hickory-dns/hickory-dns/commit/4442572040be1ca36d2099ac85ac6d0ff90f9ba9) proto: re-order Protocol impls - [`eedfd6d`](https://github.com/hickory-dns/hickory-dns/commit/eedfd6d9db09ed67388f00943a92a9960cb3f0c1) proto: drop Default impl for Protocol - [`0080b6c`](https://github.com/hickory-dns/hickory-dns/commit/0080b6c45291292ce39cbdee4682702520cdd4a5) resolver: introduce ProtocolConfig ### 📊 Changes **34 files changed** (+462 additions, -510 deletions) <details> <summary>View changed files</summary> 📝 `bin/src/lib.rs` (+2 -2) 📝 `bin/tests/integration/config_tests.rs` (+7 -0) 📝 `bin/tests/integration/named_https_tests.rs` (+1 -1) 📝 `bin/tests/integration/named_quic_tests.rs` (+1 -1) 📝 `bin/tests/integration/named_rustls_tests.rs` (+8 -4) 📝 `conformance/packages/dns-test/src/templates/hickory.forwarder.toml.jinja` (+1 -1) 📝 `crates/proto/src/h2/h2_client_stream.rs` (+22 -20) 📝 `crates/proto/src/h3/h3_client_stream.rs` (+34 -37) 📝 `crates/proto/src/quic/quic_client_stream.rs` (+17 -21) 📝 `crates/proto/src/quic/tests.rs` (+2 -4) 📝 `crates/proto/src/rustls/tls_client_stream.rs` (+7 -8) 📝 `crates/proto/src/rustls/tls_stream.rs` (+17 -16) 📝 `crates/proto/src/xfer/mod.rs` (+15 -36) 📝 `crates/recursor/src/recursor_dns_handle.rs` (+1 -1) 📝 `crates/resolver/src/config.rs` (+187 -201) 📝 `crates/resolver/src/h2.rs` (+4 -4) 📝 `crates/resolver/src/h3.rs` (+3 -3) 📝 `crates/resolver/src/lib.rs` (+1 -1) 📝 `crates/resolver/src/name_server/connection_provider.rs` (+34 -31) 📝 `crates/resolver/src/name_server/name_server.rs` (+5 -8) _...and 14 more files_ </details> ### 📄 Description This is eventually in service of https://github.com/hickory-dns/hickory-dns/issues/2738. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>