diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-09-27 12:55:46 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-09-27 12:16:34 +0000 |
| commit | 776b4d5646ee60fe53b8ee71f98970d3593b7c1f (patch) | |
| tree | 093b7187a71bf900a64fb9169ed45ba9bcffa3fd /epan/dissectors/packet-dns.c | |
| parent | 0cc8feb4b6bd5c2576ae5f11e947d172fe1e6cb1 (diff) | |
DNS: update content type for DoH draft -07 (up to draft -14)
This is required for the latest version. The message type "dns/message"
was briefly used in draft -06, but it was changed in the next version.
Change-Id: If26e367b71b7e270cad2f61eaee76041f530273c
Ping-Bug: 14433
Reviewed-on: https://code.wireshark.org/review/29887
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dns.c')
| -rw-r--r-- | epan/dissectors/packet-dns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 9a17ebf87c..9c4902576f 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -4103,8 +4103,8 @@ dissect_dns_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) static int dissect_dns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { - /* draft-ietf-doh-dns-over-https-03 */ - gboolean is_doh = !g_strcmp0(pinfo->match_string, "application/dns-udpwireformat"); + /* since draft-ietf-doh-dns-over-https-07 */ + gboolean is_doh = !g_strcmp0(pinfo->match_string, "application/dns-message"); if (pinfo->ptype == PT_TCP && !is_doh) { return dissect_dns_tcp(tvb, pinfo, tree, data); @@ -4225,7 +4225,7 @@ proto_reg_handoff_dns(void) 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); - dissector_add_string("media_type", "application/dns-udpwireformat", dns_handle); /* draft-ietf-doh-dns-over-https-03 */ + dissector_add_string("media_type", "application/dns-message", dns_handle); /* since draft-ietf-doh-dns-over-https-07 */ } void |