From: Denis Ovsienko <infrastation@yandex.ru>
Date: Tue, 18 Oct 2011 14:33:53 +0000 (+0400)
Subject: lib: optimize apply_mask_ipv4()
X-Git-Tag: frr-2.0-rc1~1953
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=caff7905e2d28e4d5e25c0a4ffacbb22e28a7121;p=mirror%2Ffrr.git

lib: optimize apply_mask_ipv4()
---

diff --git a/lib/prefix.c b/lib/prefix.c
index 075c9dabd1..1ddbbbe7e8 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -545,27 +545,12 @@ ip_masklen (struct in_addr netmask)
   return len;
 }
 
-/* Apply mask to IPv4 prefix. */
+/* Apply mask to IPv4 prefix (network byte order). */
 void
 apply_mask_ipv4 (struct prefix_ipv4 *p)
 {
-  u_char *pnt;
-  int index;
-  int offset;
-
-  index = p->prefixlen / 8;
-
-  if (index < 4)
-    {
-      pnt = (u_char *) &p->prefix;
-      offset = p->prefixlen % 8;
-
-      pnt[index] &= maskbit[offset];
-      index++;
-
-      while (index < 4)
-	pnt[index++] = 0;
-    }
+  assert (p->prefixlen >= 0 && p->prefixlen <= IPV4_MAX_BITLEN);
+  p->prefix.s_addr &= maskbytes_network[p->prefixlen];
 }
 
 /* If prefix is 0.0.0.0/0 then return 1 else return 0. */