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-6lowpan.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-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 61e1985558..6028f215db 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1215,7 +1215,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg /* Display the source address. */ if (tree) { proto_tree_add_ipv6(tree, hf_6lowpan_source, tvb, offset>>3, - BITS_TO_BYTE_LEN(offset, (bit_offset-offset)), (guint8 *)&ipv6.ip6_src); + BITS_TO_BYTE_LEN(offset, (bit_offset-offset)), &ipv6.ip6_src); } /* * Do not set the address columns until after defragmentation, since we have @@ -1247,7 +1247,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg /* Display the destination address. */ if (tree) { proto_tree_add_ipv6(tree, hf_6lowpan_dest, tvb, offset>>3, - BITS_TO_BYTE_LEN(offset, (bit_offset-offset)), (guint8 *)&ipv6.ip6_dst); + BITS_TO_BYTE_LEN(offset, (bit_offset-offset)), &ipv6.ip6_dst); } /* * Do not set the address columns until after defragmentation, since we have @@ -1663,13 +1663,13 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Display the source IPv6 address. */ if (tree) { - proto_tree_add_ipv6(tree, hf_6lowpan_source, tvb, offset, length, (guint8 *)&ipv6.ip6_src); + proto_tree_add_ipv6(tree, hf_6lowpan_source, tvb, offset, length, &ipv6.ip6_src); } /* Add information about where the context came from. */ /* TODO: We should display the prefix length too. */ if (tree && sctx->plen) { proto_item *ti; - ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_sctx_prefix, tvb, 0, 0, (guint8 *)&sctx->prefix); + ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_sctx_prefix, tvb, 0, 0, &sctx->prefix); PROTO_ITEM_SET_GENERATED(ti); if ( sctx->frame ) { ti = proto_tree_add_uint(iphc_tree, hf_6lowpan_iphc_sctx_origin, tvb, 0, 0, sctx->frame); @@ -1790,13 +1790,13 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d /* Display the destination IPv6 address. */ if (tree) { - proto_tree_add_ipv6(tree, hf_6lowpan_dest, tvb, offset, length, (guint8 *)&ipv6.ip6_dst); + proto_tree_add_ipv6(tree, hf_6lowpan_dest, tvb, offset, length, &ipv6.ip6_dst); } /* Add information about where the context came from. */ /* TODO: We should display the prefix length too. */ if (tree && dctx->plen) { proto_item *ti; - ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_dctx_prefix, tvb, 0, 0, (guint8 *)&dctx->prefix); + ti = proto_tree_add_ipv6(iphc_tree, hf_6lowpan_iphc_dctx_prefix, tvb, 0, 0, &dctx->prefix); PROTO_ITEM_SET_GENERATED(ti); if ( dctx->frame ) { ti = proto_tree_add_uint(iphc_tree, hf_6lowpan_iphc_dctx_origin, tvb, 0, 0, dctx->frame); |