Fix a panic in handling forwarded queries #1125
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
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
sanimej
force-pushed
the
bugs
branch
3 times, most recently
from
fbdb5ef
to
62ea95b
Compare
| @@ -388,7 +391,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) { | |||
|
|
|||
| // forwardQueryStart stores required context to mux multiple client queries over | |||
| // one connection; and limits the number of outstanding concurrent queries. | |||
| if r.forwardQueryStart(w, query) == false { | |||
| if r.forwardQueryStart(w, query, queryID) == false { | |||
There was a problem hiding this comment.
The passed query contains the ID. And queryID seems to initialized to query.ID above so I don't understand the need to pass it separately. What is it fixing?
There was a problem hiding this comment.
forwardQueryStart() changes the ID in the query to the one allocated by embedded Server. After sending the query to a first resolver if it timesout or gets a response but couldn't retrieve the context we continue and send it to the next resolver. When doing that the ID we have to save is the one that we got from the client and not the one in the current query because its the changed value.
|
LGTM |
1 similar comment
|
LGTM |
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.
Fixes #1117
Related to docker/docker #22081
Signed-off-by: Santhosh Manohar santhosh@docker.com