Add EDNS0 support #3131
Merged
Add EDNS0 support #3131
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
sethvargo
force-pushed
the
sethvargo/edns0
branch
from
97e31ea
to
71479d4
Compare
slackpad
reviewed
Jun 9, 2017
command/agent/dns_test.go
Outdated
| @@ -4377,16 +4418,16 @@ func TestDNS_Compression_trimUDPResponse(t *testing.T) { | |||
| t.Parallel() | |||
| config := &DefaultConfig().DNSConfig | |||
|
|
|||
| m := dns.Msg{} | |||
| trimUDPResponse(config, &m) | |||
| req, m := dns.Msg{}, dns.Msg{} | |||
There was a problem hiding this comment.
Can you add another trim case? This has been a notorious source of subtle bugs so is worth poking a bit.
slackpad
reviewed
Jun 10, 2017
command/agent/dns.go
Outdated
| @@ -525,9 +538,17 @@ func syncExtra(index map[string]dns.RR, resp *dns.Msg) { | |||
| // 1035. Enforce an arbitrary limit that can be further ratcheted down by | |||
| // config, and then make sure the response doesn't exceed 512 bytes. Any extra | |||
| // records will be trimmed along with answers. | |||
| func trimUDPResponse(config *DNSConfig, resp *dns.Msg) (trimmed bool) { | |||
| func trimUDPResponse(config *DNSConfig, req, resp *dns.Msg) (trimmed bool) { | |||
There was a problem hiding this comment.
Actually, if you pass maxSize in here instead of req this would be simpler to test on its own.
There was a problem hiding this comment.
That API simplifies the method signature a bit, but it's quite easy to make an empty dns.Msg. It makes all the calls to trimUDPResponse a lot longer with more duplication to extract whether it's an edns message and pull out the max size. Each call prior to TrimUDPResponse has to parse out the req, which seemed like a lot of duplication.
This is a refactor of GH-1980. Originally I tried to do a straight rebase, but the code has changed too much.
sethvargo
force-pushed
the
sethvargo/edns0
branch
from
71479d4
to
171b43e
Compare
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 is a refactor of GH-1980. Originally I tried to do a straight rebase, but the code has changed too much.