diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-09-12 06:21:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-09-12 06:21:35 +0000 |
| commit | 39fd819fb4f986330167e4f1d51ecb00f07cf775 (patch) | |
| tree | 221a7573bb57f01d4f28be59a4a1e5d7f9b9c909 /epan/addr_and_mask.c | |
| parent | f9b16868836047da2a15384419d576f08eea8e29 (diff) | |
Don't collide with the "regular" IPv6 defintions in at least some
platforms in ipv6-utils.h.
svn path=/trunk/; revision=15764
Diffstat (limited to 'epan/addr_and_mask.c')
| -rw-r--r-- | epan/addr_and_mask.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/addr_and_mask.c b/epan/addr_and_mask.c index 3dd2941034..26cb16c417 100644 --- a/epan/addr_and_mask.c +++ b/epan/addr_and_mask.c @@ -64,10 +64,10 @@ ipv6_addr_and_mask(tvbuff_t *tvb, int offset, struct e_in6_addr *addr, return -1; addr_len = (prefix_len + 7) / 8; - memset(addr->u6_addr.u6_addr8, 0, 16); - tvb_memcpy(tvb, addr->u6_addr.u6_addr8, offset, addr_len); + memset(addr->bytes, 0, 16); + tvb_memcpy(tvb, addr->bytes, offset, addr_len); if (prefix_len % 8) { - addr->u6_addr.u6_addr8[addr_len - 1] &= + addr->bytes[addr_len - 1] &= ((0xff00 >> (prefix_len % 8)) & 0xff); } |