treat ::ffff:0.0.0.0/96 as ipv4 0/0

[irc/quakenet/newserv.git] / lib / irc_ipv6.h

diff --git a/lib/irc_ipv6.h b/lib/irc_ipv6.h
index d78efc8d529b7bb85a944dbcb447cd0ed4483643..f5fb361ae86c99c0fc129f39e0f3c1aab77db1f8 100644 (file)
--- a/lib/irc_ipv6.h
+++ b/lib/irc_ipv6.h
@@ -3,6 +3,8 @@
 #ifndef __irc_ipv6_H
 #define __irc_ipv6_H
 
+#include <limits.h>
+
 /* from res.h */
 
 /** Structure to store an IP address. */
@@ -18,6 +20,8 @@ struct irc_sockaddr
   unsigned short port;     /**< Port number, host-endian. */
 };
 
+#define irc_bitlen(ADDR, BITS) (irc_in_addr_is_ipv4(ADDR) ? (BITS) - 96 : (BITS))
+
 /** Evaluate to non-zero if \a ADDR is a valid address (not all 0s and not all 1s). */
 #define irc_in_addr_valid(ADDR) (((ADDR)->in6_16[0] && ~(ADDR)->in6_16[0]) \
                                  || (ADDR)->in6_16[1] != (ADDR)->in6_16[0] \
@@ -29,8 +33,8 @@ struct irc_sockaddr
                                  || (ADDR)->in6_16[7] != (ADDR)->in6_16[0])
 /** Evaluate to non-zero if \a ADDR (of type struct irc_in_addr) is an IPv4 address. */
 #define irc_in_addr_is_ipv4(ADDR) (!(ADDR)->in6_16[0] && !(ADDR)->in6_16[1] && !(ADDR)->in6_16[2] \
-                                   && !(ADDR)->in6_16[3] && !(ADDR)->in6_16[4] && (ADDR)->in6_16[6] \
-                                   && (!(ADDR)->in6_16[5] || (ADDR)->in6_16[5] == 65535))
+                                   && !(ADDR)->in6_16[3] && !(ADDR)->in6_16[4] && ((!(ADDR)->in6_16[5] \
+                                   && (ADDR)->in6_16[6]) || (ADDR)->in6_16[5] == 65535))
 /** Evaluate to non-zero if \a A is a different IP than \a B. */
 #define irc_in_addr_cmp(A,B) (irc_in_addr_is_ipv4(A) ? ((A)->in6_16[6] != (B)->in6_16[6] \
                                   || (A)->in6_16[7] != (B)->in6_16[7] || !irc_in_addr_is_ipv4(B)) \