# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1314324473 -10800
# Node ID d473660bc54d1ead7aec74d6898e855fe9f18df8
# Parent  4317429862e1726d0b4a7efe1309885ec03c17c2
liblib: Added IPADDR_BITS() macro.

diff -r 4317429862e1 -r d473660bc54d src/lib/network.c
--- a/src/lib/network.c	Thu Aug 25 03:54:50 2011 +0300
+++ b/src/lib/network.c	Fri Aug 26 05:07:53 2011 +0300
@@ -911,7 +911,7 @@
 	if (net_addr2ip(network, ip_r) < 0)
 		return -1;
 
-	max_bits = IPADDR_IS_V4(ip_r) ? 32 : 128;
+	max_bits = IPADDR_BITS(ip_r);
 	if (p == NULL) {
 		/* full IP address must match */
 		bits = max_bits;
diff -r 4317429862e1 -r d473660bc54d src/lib/network.h
--- a/src/lib/network.h	Thu Aug 25 03:54:50 2011 +0300
+++ b/src/lib/network.h	Fri Aug 26 05:07:53 2011 +0300
@@ -45,6 +45,7 @@
 
 #define IPADDR_IS_V4(ip) ((ip)->family == AF_INET)
 #define IPADDR_IS_V6(ip) ((ip)->family == AF_INET6)
+#define IPADDR_BITS(ip) (IPADDR_IS_V4(ip) ? 32 : 128)
 
 /* Returns TRUE if IPs are the same */
 bool net_ip_compare(const struct ip_addr *ip1, const struct ip_addr *ip2);