summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Ovsienko <infrastation@yandex.ru>2012-01-01 16:33:12 +0400
committerDenis Ovsienko <infrastation@yandex.ru>2012-01-01 16:37:45 +0400
commit8c7f49d27767886b3706dfca11c1e13abeab7c63 (patch)
tree6a0b18574e1ac20d0402908913e0700f6799a02f
parent223da1a912305f2cac6f72c3b480ce103a25d7d6 (diff)
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.
-rw-r--r--lib/prefix.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/lib/prefix.c b/lib/prefix.c
index c8fd0bd8..1ddbbbe7 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