diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-07 08:11:57 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-07 07:54:17 +0000 |
| commit | 869530331400d8cae3694980fa114289cc03e081 (patch) | |
| tree | f8c5bc06b5af134f33cff33c3d4a5d8aacf58297 | |
| parent | 4bd74c7def392a93c8a96177ac249a7a9ddaf52a (diff) | |
IPv6: add changes forgotten in gbedda9b
Bug: 11570
Change-Id: I5a8d89253becd550e0330c82ab0811c502db6d61
Reviewed-on: https://code.wireshark.org/review/10849
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 3ff96e8904..e4c26b594f 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -971,7 +971,7 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data /* Display Full Address */ memcpy((guint8 *)addr, (guint8 *)&dstAddr, sizeof(dstAddr)); tvb_memcpy(tvb, (guint8 *)addr + cmprI, offset, (16-cmprI)); - ti = proto_tree_add_ipv6(rthdr_tree, hf_ipv6_routing_rpl_fulladdr, tvb, offset, (16-cmprI), (guint8 *)&addr); + ti = proto_tree_add_ipv6(rthdr_tree, hf_ipv6_routing_rpl_fulladdr, tvb, offset, (16-cmprI), (guint8 *)addr); PROTO_ITEM_SET_GENERATED(ti); offset += (16-cmprI); segments--; @@ -1029,8 +1029,8 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data proto_tree_add_item(rthdr_tree, hf_ipv6_routing_rpl_addr, tvb, offset, (16-cmprE), ENC_NA); /* Display Full Address */ memcpy((guint8 *)addr, (guint8 *)&dstAddr, sizeof(dstAddr)); - tvb_memcpy(tvb, (guint8 *)&addr + cmprE, offset, (16-cmprE)); - ti = proto_tree_add_ipv6(rthdr_tree, hf_ipv6_routing_rpl_fulladdr, tvb, offset, (16-cmprE), (guint8 *)&addr); + tvb_memcpy(tvb, (guint8 *)addr + cmprE, offset, (16-cmprE)); + ti = proto_tree_add_ipv6(rthdr_tree, hf_ipv6_routing_rpl_fulladdr, tvb, offset, (16-cmprE), (guint8 *)addr); PROTO_ITEM_SET_GENERATED(ti); /* offset += (16-cmprE); */ |