aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dns.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2020-02-22 19:01:07 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2020-02-23 06:10:18 +0000
commit1403c09105e5c9b9a5adc17581c39b6355ef8935 (patch)
tree76e71d172b5b8b9d8d4b1dbb46a6ef6873aea098 /epan/dissectors/packet-dns.c
parenta2530f740d67d41908e84434bb5ec99480c2ac2e (diff)
DNS: Add DoT ALPN (RFC 7858)
This codepoint was not registered in RFC 7858, but requested later by Jon Reed at 2019-12-12, in "[dns-privacy] ALPN protocol ID for DoT": Tne primary use case we have is supporting both DoT and DoH on port 443, when port 853 is blocked between clients and the servers (this is by mutual agreement, as discussed in RFC 7858 ยง 3.1). Change-Id: Ic993023eedf6f40565a208033703aa1575710c17 Reviewed-on: https://code.wireshark.org/review/36151 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dns.c')
-rw-r--r--epan/dissectors/packet-dns.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 2280405154..5289bd3186 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -4298,6 +4298,8 @@ proto_reg_handoff_dns(void)
gssapi_handle = find_dissector_add_dependency("gssapi", proto_dns);
ntlmssp_handle = find_dissector_add_dependency("ntlmssp", proto_dns);
ssl_dissector_add(TCP_PORT_DNS_TLS, dns_handle);
+ // RFC 7858 - registration via https://mailarchive.ietf.org/arch/msg/dns-privacy/iZ2rDIhFB2ZWsGC3PcdBVLGa8Do
+ dissector_add_string("tls.alpn", "dot", dns_handle);
dtls_dissector_add(UDP_PORT_DNS_DTLS, dns_handle);
dissector_add_uint_range_with_preference("tcp.port", DEFAULT_DNS_TCP_PORT_RANGE, dns_handle);
dissector_add_uint_range_with_preference("udp.port", DEFAULT_DNS_PORT_RANGE, dns_handle);