changeset 13290:d473660bc54d

liblib: Added IPADDR_BITS() macro.
author Timo Sirainen <tss@iki.fi>
date Fri, 26 Aug 2011 05:07:53 +0300
parents 4317429862e1
children 6eb42d5d0ce3
files src/lib/network.c src/lib/network.h
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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);