[PR #3027] [MERGED] resolver: use a single list of servers #3504

New issue

Closed

opened 2026-03-16 11:47:10 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:47:10 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/3027
Author: @djc
Created: 6/2/2025
Status: ✅ Merged
Merged: 6/6/2025
Merged by: @djc

Base: main ← Head: single-list-redux

📝 Commits (9)

a848b12 resolver: use trust data directly
17789e6 proto: inline RetryableError trait methods
fefd6db tests: avoid relying on swallowing errors
23127b4 tests: make test_distrust_nx_responses() more deterministic
b7ffeb4 tests: restrict retryable response codes
d0de9b4 conformance: trust the upstream server's negative responses
79f54c7 resolver: use a single list of servers
f080d44 resolver: prefer IPv4 addresses in AdGuard test
dd93488 resolver: prefer IPv4 addresses in Google/H3 test

📊 Changes

12 files changed (+241 additions, -283 deletions)

View changed files

📝 conformance/packages/dns-test/src/templates/hickory.forwarder.toml.jinja (+1 -0)
📝 crates/proto/src/error.rs (+14 -14)
📝 crates/proto/src/xfer/retry_dns_handle.rs (+2 -23)
📝 crates/recursor/src/recursor.rs (+1 -2)
📝 crates/resolver/src/caching_client.rs (+1 -3)
📝 crates/resolver/src/config.rs (+14 -2)
📝 crates/resolver/src/h3.rs (+6 -3)
📝 crates/resolver/src/name_server/name_server.rs (+10 -3)
📝 crates/resolver/src/name_server/name_server_pool.rs (+76 -114)
📝 crates/resolver/src/quic.rs (+4 -1)
📝 tests/integration-tests/tests/integration/name_server_pool_tests.rs (+111 -117)
📝 tests/integration-tests/tests/integration/retry_dns_handle_tests.rs (+1 -1)

📄 Description

No description provided

_{🔄 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/3027 **Author:** [@djc](https://github.com/djc) **Created:** 6/2/2025 **Status:** ✅ Merged **Merged:** 6/6/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `single-list-redux` --- ### 📝 Commits (9) - [`a848b12`](https://github.com/hickory-dns/hickory-dns/commit/a848b12f5f4d901f9cdfc7a345f26dfd0e3151c3) resolver: use trust data directly - [`17789e6`](https://github.com/hickory-dns/hickory-dns/commit/17789e632f23f8cf363ae1f70209402fe82fdbce) proto: inline RetryableError trait methods - [`fefd6db`](https://github.com/hickory-dns/hickory-dns/commit/fefd6dbef7cf68ad6e9c9a8b487da03b72c42f0c) tests: avoid relying on swallowing errors - [`23127b4`](https://github.com/hickory-dns/hickory-dns/commit/23127b444d4597e07f51212d0020c1e513e7c5d1) tests: make test_distrust_nx_responses() more deterministic - [`b7ffeb4`](https://github.com/hickory-dns/hickory-dns/commit/b7ffeb4885587f1a353e71b291a12294087cbde2) tests: restrict retryable response codes - [`d0de9b4`](https://github.com/hickory-dns/hickory-dns/commit/d0de9b443673f551a85e695c9c54970b213fbc19) conformance: trust the upstream server's negative responses - [`79f54c7`](https://github.com/hickory-dns/hickory-dns/commit/79f54c7a2cdfb92f63f69105a50e51acb7d5e900) resolver: use a single list of servers - [`f080d44`](https://github.com/hickory-dns/hickory-dns/commit/f080d440f13ea86bea60570f379bc81eff837fd8) resolver: prefer IPv4 addresses in AdGuard test - [`dd93488`](https://github.com/hickory-dns/hickory-dns/commit/dd934886a9bc587a3b1faffd14dd2f1c8b298c62) resolver: prefer IPv4 addresses in Google/H3 test ### 📊 Changes **12 files changed** (+241 additions, -283 deletions) <details> <summary>View changed files</summary> 📝 `conformance/packages/dns-test/src/templates/hickory.forwarder.toml.jinja` (+1 -0) 📝 `crates/proto/src/error.rs` (+14 -14) 📝 `crates/proto/src/xfer/retry_dns_handle.rs` (+2 -23) 📝 `crates/recursor/src/recursor.rs` (+1 -2) 📝 `crates/resolver/src/caching_client.rs` (+1 -3) 📝 `crates/resolver/src/config.rs` (+14 -2) 📝 `crates/resolver/src/h3.rs` (+6 -3) 📝 `crates/resolver/src/name_server/name_server.rs` (+10 -3) 📝 `crates/resolver/src/name_server/name_server_pool.rs` (+76 -114) 📝 `crates/resolver/src/quic.rs` (+4 -1) 📝 `tests/integration-tests/tests/integration/name_server_pool_tests.rs` (+111 -117) 📝 `tests/integration-tests/tests/integration/retry_dns_handle_tests.rs` (+1 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>