Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dnsdist: Carry the exact incoming protocol (Do53, DNSCrypt, DoT, DoH) in DQ #10537

Merged
merged 11 commits into from
Jul 7, 2021

Conversation

rgacogne
Copy link
Member

@rgacogne rgacogne commented Jun 29, 2021

Short description

This turned out to be more difficult than I expected. Part of the work already existed in #10338 but was not enough to be able to pass the right protocol to dnstap, which I wanted to do since it now supports DoT and DoH (updated dnstap.proto is included in this PR).

Fixes #10497.

I added the "backport to dnsdist-1.6.x" label because I think we need to fix the dnstap issue on that branch as well, but we clearly should not backport this PR. Perhaps a simple test on whether the request was received over DoH (dq.du is not nullptr) would be enough for 1.6.x?

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled this code
  • tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

We don't support the exact transport yet.
Copy link
Member

@omoerbeek omoerbeek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed much longer that you'd think. Anyway, looks good (with a few nits).

pdns/dnsdist.hh Outdated Show resolved Hide resolved
pdns/dnsdist.hh Outdated Show resolved Hide resolved
pdns/test-dnsdistpacketcache_cc.cc Show resolved Hide resolved
pdns/test-dnsdist_cc.cc Show resolved Hide resolved
@rgacogne rgacogne merged commit 3d29bc4 into PowerDNS:master Jul 7, 2021
@rgacogne rgacogne deleted the ddist-exact-protocol-in-dq branch July 7, 2021 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dnsdist: dnstap writes down wrong protocol
2 participants