diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
commit | 6bde91807842874d396f80faf5653e5403c249dc (patch) | |
tree | 8dc51d6ec7d1ecb0e5d6f8bed87a43ba01fc10a7 /epan/dissectors/packet-ipv6.c | |
parent | 3eb06be97d520daef0bad19bf9c261b01abdc66d (diff) | |
download | wireshark-6bde91807842874d396f80faf5653e5403c249dc.tar.gz |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
Diffstat (limited to 'epan/dissectors/packet-ipv6.c')
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 79d79cc62d..d9fa90b063 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1808,7 +1808,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_guint8(tvb, offset + IP6H_SRC + 8) & 0x02 && tvb_get_ntohs(tvb, offset + IP6H_SRC + 11) == 0xfffe) { /* RFC 4291 appendix A */ - mac_addr = ep_alloc(6); + mac_addr = (guint8 *)ep_alloc(6); tvb_memcpy(tvb, mac_addr, offset + IP6H_SRC + 8, 3); tvb_memcpy(tvb, mac_addr+3, offset+ IP6H_SRC + 13, 3); mac_addr[0] &= ~0x02; @@ -1895,7 +1895,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_guint8(tvb, offset + IP6H_DST + 8) & 0x02 && tvb_get_ntohs(tvb, offset + IP6H_DST + 11) == 0xfffe) { /* RFC 4291 appendix A */ - mac_addr = ep_alloc(6); + mac_addr = (guint8 *)ep_alloc(6); tvb_memcpy(tvb, mac_addr, offset + IP6H_DST + 8, 3); tvb_memcpy(tvb, mac_addr+3, offset+ IP6H_DST + 13, 3); mac_addr[0] &= ~0x02; |