From bf19277c341e6c1b94046c628c0e6d0f0b20d536 Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Sun, 1 Jan 2012 16:33:12 +0400 Subject: Revert "lib: optimize apply_mask_ipv6()" Experience with IPv4 counterpart of this function suggests, that this way of type-punning is likely to cause errors. --- lib/prefix.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'lib/prefix.c') diff --git a/lib/prefix.c b/lib/prefix.c index 54b9bc8a..f4b0c4f1 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -660,13 +660,23 @@ masklen2ip6 (const int masklen, struct in6_addr *netmask) void apply_mask_ipv6 (struct prefix_ipv6 *p) { - assert (p->prefixlen >= 0 && p->prefixlen <= IPV6_MAX_BITLEN); - u_int32_t *addr_word = (u_int32_t *) &p->prefix; - u_int32_t *mask_word = (u_int32_t *) (maskbytes6 + p->prefixlen); - *addr_word++ &= *mask_word++; - *addr_word++ &= *mask_word++; - *addr_word++ &= *mask_word++; - *addr_word &= *mask_word; + u_char *pnt; + int index; + int offset; + + index = p->prefixlen / 8; + + if (index < 16) + { + pnt = (u_char *) &p->prefix; + offset = p->prefixlen % 8; + + pnt[index] &= maskbit[offset]; + index++; + + while (index < 16) + pnt[index++] = 0; + } } void -- cgit v1.2.1