fix(dns): avoid early return when dns query refused #2878
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
yuhan6665
reviewed
Jan 2, 2024
app/dns/dns.go
Outdated
| @@ -215,7 +216,10 @@ func (s *DNS) LookupIP(domain string, option dns.IPOption) ([]net.IP, error) { | |||
| newError("failed to lookup ip for domain ", domain, " at server ", client.Name()).Base(err).WriteToLog() | |||
| errs = append(errs, err) | |||
| } | |||
| if err != context.Canceled && err != context.DeadlineExceeded && err != errExpectedIPNonMatch && err != dns.ErrEmptyResponse { | |||
| if dns.RCodeFromError(err) == dns_lib.RcodeRefused { | |||
| newError("DNS request for domain", domain, "got refused by server ", client.Name()).Base(err).AtError().WriteToLog() | |||
There was a problem hiding this comment.
Can you combine this error with line 216? E.g. only log once
app/dns/dns.go
Outdated
| @@ -9,6 +9,7 @@ import ( | |||
| "strings" | |||
| "sync" | |||
|
|
|||
| dns_lib "github.com/miekg/dns" | |||
There was a problem hiding this comment.
Import this lib add quite a bit to the binary size. Can we hard code a constant for now?
|
Resolved @yuhan6665 |
|
Thanks for your pr! |
|
Thank you and rprx for the effort too! Happy new year! |
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.
The current code will not try other name servers when encounter
RcodeRefused.This happens, for example, if I am using a name server that is only accessible in certain area (office, school, etc), then I move to another place (home), which results in the previous name server refuse my DNS request, and the website browsering does not work at all (but it should try other servers with
skipFallbackto false, at least).