fix(iroh-net): race ipv4 and ipv6 dns resolution #2026
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flub
approved these changes
Feb 15, 2024
iroh-net/src/dns.rs
Outdated
|
|
||
| let resolver = AsyncResolver::tokio(config, options); | ||
| Ok(resolver) | ||
| } | ||
|
|
||
| /// Resolve IPv4 and IPv6 in parallel |
There was a problem hiding this comment.
This should probably elaborate a little why we don't use the Ipv4AndIpv6 strategy.
There was a problem hiding this comment.
added some details
iroh-net/src/dns.rs
Outdated
| .collect(); | ||
| Ok(res) | ||
| } | ||
| (Ok(Ok(ipv4)), Err(_err)) => { |
There was a problem hiding this comment.
Suggested change
| (Ok(Ok(ipv4)), Err(_err)) => { | |
| (Ok(Ok(ipv4)), Err(_timeout)) => { |
is perhaps a little bit more readable?
(in all places were a timeout err is matched)
dignifiedquire
force-pushed
the
fix-ipv6-dns
branch
from
4f26bae
to
870bce3
Compare
fubuloubu
pushed a commit
to ApeWorX/iroh
that referenced
this pull request
Feb 21, 2024
This now races the resolution, with a fixed timeout on each, returning as many results as found during that time. Ref n0-computer#2006
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This now races the resolution, with a fixed timeout on each, returning as many results as found during that time.
Ref #2006