[PR #2569] [MERGED] Start untangling rustls ClientConfig setup #3146

New issue

Closed

opened 2026-03-16 11:27:54 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:27:54 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/2569
Author: @djc
Created: 11/12/2024
Status: ✅ Merged
Merged: 11/18/2024
Merged by: @djc

Base: main ← Head: rustls-client-config

📝 Commits (7)

2a122cc Avoid aliases for rustls::ClientConfig
4117eb4 resolver: restrict PartialEq impl for NameServerConfig
f9b7bc4 resolver: use named fields for NameServerConfigGroup
aea6520 resolver: simplify serde for NameServerConfigGroup
44662ea resolver: restrict PartialEq impl for NameServerConfigGroup
3ff8137 resolver: remove low-value equality wrapper
1874ac6 Remove unnecessary PartialEq/Eq implementations

📊 Changes

12 files changed (+153 additions, -202 deletions)

View changed files

📝 bin/src/lib.rs (+11 -9)
📝 bin/tests/integration/config_tests.rs (+35 -72)
📝 crates/proto/src/h3/h3_client_stream.rs (+2 -3)
📝 crates/proto/src/quic/quic_client_stream.rs (+11 -11)
📝 crates/resolver/src/config.rs (+59 -69)
📝 crates/resolver/src/h2.rs (+6 -8)
📝 crates/resolver/src/h3.rs (+7 -11)
📝 crates/resolver/src/name_server/name_server_pool.rs (+2 -2)
📝 crates/resolver/src/quic.rs (+5 -7)
📝 crates/resolver/src/system_conf/unix.rs (+12 -6)
📝 crates/resolver/src/tls/dns_over_rustls.rs (+2 -3)
📝 crates/server/src/store/forwarder/config.rs (+1 -1)

📄 Description

There's lots of duplication across libraries and tests around building a ClientConfig and a few problems as discussed in #2038. Start cleaning up the the resolver code around this to reduce unnecessary layers of abstraction.

_{🔄 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/2569 **Author:** [@djc](https://github.com/djc) **Created:** 11/12/2024 **Status:** ✅ Merged **Merged:** 11/18/2024 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `rustls-client-config` --- ### 📝 Commits (7) - [`2a122cc`](https://github.com/hickory-dns/hickory-dns/commit/2a122cc067b24e225bb76d7dace7f0172f01b418) Avoid aliases for rustls::ClientConfig - [`4117eb4`](https://github.com/hickory-dns/hickory-dns/commit/4117eb4ed1271ccb0e8e235c558e18ee3a9dd174) resolver: restrict PartialEq impl for NameServerConfig - [`f9b7bc4`](https://github.com/hickory-dns/hickory-dns/commit/f9b7bc4c132daeaccf14b8c147b0595af9d22c7c) resolver: use named fields for NameServerConfigGroup - [`aea6520`](https://github.com/hickory-dns/hickory-dns/commit/aea652056b2751bbdcfe27e970bb0f3fa2362dfd) resolver: simplify serde for NameServerConfigGroup - [`44662ea`](https://github.com/hickory-dns/hickory-dns/commit/44662eaeb7ee9c997fdc705508d51c6a4b345b86) resolver: restrict PartialEq impl for NameServerConfigGroup - [`3ff8137`](https://github.com/hickory-dns/hickory-dns/commit/3ff81373186c6ebc2c9ca7b98862b57ea14123f2) resolver: remove low-value equality wrapper - [`1874ac6`](https://github.com/hickory-dns/hickory-dns/commit/1874ac6afc28ad1e037268fd029be4b6e0626ee8) Remove unnecessary PartialEq/Eq implementations ### 📊 Changes **12 files changed** (+153 additions, -202 deletions) <details> <summary>View changed files</summary> 📝 `bin/src/lib.rs` (+11 -9) 📝 `bin/tests/integration/config_tests.rs` (+35 -72) 📝 `crates/proto/src/h3/h3_client_stream.rs` (+2 -3) 📝 `crates/proto/src/quic/quic_client_stream.rs` (+11 -11) 📝 `crates/resolver/src/config.rs` (+59 -69) 📝 `crates/resolver/src/h2.rs` (+6 -8) 📝 `crates/resolver/src/h3.rs` (+7 -11) 📝 `crates/resolver/src/name_server/name_server_pool.rs` (+2 -2) 📝 `crates/resolver/src/quic.rs` (+5 -7) 📝 `crates/resolver/src/system_conf/unix.rs` (+12 -6) 📝 `crates/resolver/src/tls/dns_over_rustls.rs` (+2 -3) 📝 `crates/server/src/store/forwarder/config.rs` (+1 -1) </details> ### 📄 Description There's lots of duplication across libraries and tests around building a `ClientConfig` and a few problems as discussed in #2038. Start cleaning up the the resolver code around this to reduce unnecessary layers of abstraction. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>