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-pim.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-pim.c')
| -rw-r--r-- | epan/dissectors/packet-pim.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index f77af445ce..bf5617e012 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -691,11 +691,11 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp if (label) { ti = proto_tree_add_ipv6_format(tree, hf_ip6, tvb, offset, 2 + len, - (guint8 *)&ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 2)); + &ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 2)); } else { - ti = proto_tree_add_ipv6(tree, hf_ip6, tvb, offset, 2 + len, (guint8 *)&ipv6); + ti = proto_tree_add_ipv6(tree, hf_ip6, tvb, offset, 2 + len, &ipv6); } break; } @@ -727,11 +727,11 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp if (label) { ti = proto_tree_add_ipv6_format(tree, hf_ip6, tvb, offset, 4 + len, - (guint8 *)&ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 4)); + &ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 4)); } else { - ti = proto_tree_add_ipv6(tree, hf_ip6, tvb, offset, 4 + len, (guint8 *)&ipv6); + ti = proto_tree_add_ipv6(tree, hf_ip6, tvb, offset, 4 + len, &ipv6); } proto_item_append_text(ti, "/%u", mask_len); break; @@ -765,11 +765,11 @@ dissect_pim_addr(proto_tree* tree, tvbuff_t *tvb, int offset, enum pimv2_addrtyp if (label) { ti = proto_tree_add_ipv6_format(tree, hf_ip6, tvb, offset, 4 + len, - (guint8 *)&ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 4)); + &ipv6, "%s: %s", label, tvb_ip6_to_str(tvb, offset + 4)); } else { - ti = proto_tree_add_ipv6_format_value(tree, hf_ip6, tvb, offset, 4 + len, (guint8 *)&ipv6, + ti = proto_tree_add_ipv6_format_value(tree, hf_ip6, tvb, offset, 4 + len, &ipv6, "%s", tvb_ip6_to_str(tvb, offset + 4)); } proto_item_append_text(ti, "/%u", mask_len); |