diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-05 22:43:46 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-10-14 12:18:00 +0000 |
| commit | a643d14187c5a201d21bdb0786acc5e27b73a3a1 (patch) | |
| tree | b09f0b90fe25a25765fd00279f549df429119cf6 /epan/dissectors/packet-dns.c | |
| parent | 9a702e41b052211424163829a2cb3487123b155e (diff) | |
Change proto_tree_add_ipv6() to take a struct e_in6_addr pointer
tvb_get_ipv6() takes a struct e_in6_addr *, use that here too.
Change-Id: Id8b368daa05c151a61d4bc01dc88c00da13e9c88
Reviewed-on: https://code.wireshark.org/review/10953
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@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 748b39347e..ddb90c2158 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2633,7 +2633,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, proto_tree_add_item(rr_tree, hf_dns_a6_prefix_len,tvb, a6_offset, 1, ENC_BIG_ENDIAN); a6_offset++; if (suf_len) { - proto_tree_add_ipv6(rr_tree, hf_dns_a6_address_suffix,tvb, a6_offset, suf_octet_count, suffix.bytes); + proto_tree_add_ipv6(rr_tree, hf_dns_a6_address_suffix,tvb, a6_offset, suf_octet_count, &suffix); a6_offset += suf_octet_count; } if (pre_len > 0) { @@ -2747,7 +2747,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, break; case AFNUM_INET6: proto_tree_add_ipv6(rropt_tree, hf_dns_opt_client_addr6, tvb, - cur_offset, addr_len, ip_addr.bytes); + cur_offset, addr_len, (struct e_in6_addr *)&ip_addr); break; default: proto_tree_add_item(rropt_tree, hf_dns_opt_client_addr, tvb, cur_offset, (optlen - 4), @@ -2811,7 +2811,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, } else if (afamily == 2 && afdpart_len <= 16) { /* IPv6 */ addr_copy = (guint8 *)wmem_alloc0(wmem_file_scope(), 16); tvb_memcpy(tvb, (guint8 *)addr_copy, cur_offset, afdpart_len); - proto_tree_add_ipv6(rr_tree, hf_dns_apl_afdpart_ipv6, tvb, cur_offset, afdpart_len, addr_copy); + proto_tree_add_ipv6(rr_tree, hf_dns_apl_afdpart_ipv6, tvb, cur_offset, afdpart_len, (struct e_in6_addr *)addr_copy); } else { /* Other... */ proto_tree_add_item(rr_tree, hf_dns_apl_afdpart_data, tvb, cur_offset, afdpart_len, ENC_NA); } |