diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-02-15 19:09:50 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-26 06:38:33 +0000 |
| commit | be1c9336000c0941fd763f9bceb39bf6958165cb (patch) | |
| tree | 4f69945585ed49484f896588a6d8148bcc7b0dd2 /epan/dissectors/packet-dns.c | |
| parent | f220073eec4b951d6d0179068d5d4ffb59537881 (diff) | |
DNS: add partial DOH (DNS Queries over HTTPS) support
Add support for POST requests, and GET and POST responses containing a
DNS (UDP) payload. GET requests are still unsupported.
(DOH is sent over HTTP2/TLS/TCP which means that a special check is
needed in dissect_dns to avoid matching DNS over TCP).
Change-Id: I82bfcda068baf6f06c5a0159d73e6d40d1d9a758
Ping-Bug: 14433
Reviewed-on: https://code.wireshark.org/review/25806
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
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 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 560f7e3afa..5e45d04fe4 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -4049,12 +4049,15 @@ 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) { - if (pinfo->ptype == PT_TCP) { - return dissect_dns_tcp(tvb, pinfo, tree, data); - } else { - dissect_dns_udp_sctp(tvb, pinfo, tree, data); - return tvb_captured_length(tvb); - } + /* draft-ietf-doh-dns-over-https-03 */ + gboolean is_doh = !g_strcmp0(pinfo->match_string, "application/dns-udpwireformat"); + + if (pinfo->ptype == PT_TCP && !is_doh) { + return dissect_dns_tcp(tvb, pinfo, tree, data); + } else { + dissect_dns_udp_sctp(tvb, pinfo, tree, data); + return tvb_captured_length(tvb); + } } static void dns_stats_tree_init(stats_tree* st) @@ -4148,6 +4151,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 */ } void |