diff options
| author | Denis Ovsienko <infrastation@yandex.ru> | 2011-10-24 18:45:05 +0400 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2012-01-08 13:42:23 +0000 |
| commit | 9ed79b53eb89b8a663eb368ef5f7d47701f231df (patch) | |
| tree | 3a0eb140a54197a46957dd41561705853e7c345e /lib | |
| parent | ce3cdcfbed2ca65d0d3a12b926dd1103910a6056 (diff) | |
lib: use prefix bit length macros
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/prefix.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/prefix.c b/lib/prefix.c index 3ab67f3d..5e8cff04 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -2460,8 +2460,8 @@ prefix_cmp (const struct prefix *p1, const struct prefix *p2) if (p1->family != p2->family || p1->prefixlen != p2->prefixlen) return 1; - offset = p1->prefixlen / 8; - shift = p1->prefixlen % 8; + offset = p1->prefixlen / PNBBY; + shift = p1->prefixlen % PNBBY; if (shift) if (maskbit[shift] & (pp1[offset] ^ pp2[offset])) @@ -2598,7 +2598,7 @@ str2prefix_ipv4 (const char *str, struct prefix_ipv4 *p) void masklen2ip (const int masklen, struct in_addr *netmask) { - assert (masklen >= 0 && masklen <= 32); + assert (masklen >= 0 && masklen <= IPV4_MAX_BITLEN); netmask->s_addr = maskbytes_network[masklen]; } @@ -2683,7 +2683,7 @@ str2prefix_ipv6 (const char *str, struct prefix_ipv6 *p) if (ret == 0) return 0; plen = (u_char) atoi (++pnt); - if (plen > 128) + if (plen > IPV6_MAX_BITLEN) return 0; p->prefixlen = plen; } @@ -2703,13 +2703,13 @@ ip6_masklen (struct in6_addr netmask) pnt = (unsigned char *) & netmask; - while ((*pnt == 0xff) && len < 128) + while ((*pnt == 0xff) && len < IPV6_MAX_BITLEN) { len += 8; pnt++; } - if (len < 128) + if (len < IPV6_MAX_BITLEN) { val = *pnt; while (val) @@ -2724,7 +2724,7 @@ ip6_masklen (struct in6_addr netmask) void masklen2ip6 (const int masklen, struct in6_addr *netmask) { - assert (masklen >=0 && masklen <= 128); + assert (masklen >= 0 && masklen <= IPV6_MAX_BITLEN); memcpy (netmask, maskbytes6 + masklen, sizeof (struct in6_addr)); } |