BIRD library: The story continues.

Complete resource manages and IP address handling.

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/ipv6.h b/lib/ipv6.h
index 98d78110..845955f4 100644
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -25,6 +25,7 @@ typedef struct ipv4_addr {
 #define IPA_NONE _MI(0,0,0,0)
 
 #define ipa_equal(x,y) (!memcmp(&(x),&(y),sizeof(ip_addr)))
+#define ipa_nonzero(x) (_I0(a) || _I1(a) || _I2(a) || _I3(a))
 #define ipa_and(a,b) _MI(_I0(a) & _I0(b), \
 			 _I1(a) & _I1(b), \
 			 _I2(a) & _I2(b), \
@@ -34,11 +35,24 @@ typedef struct ipv4_addr {
 			_I2(a) | _I2(b), \
 			_I3(a) | _I3(b))
 #define ipa_not(a) _MI(~_I0(a),~_I1(a),~_I2(a),~_I3(a))
-
 #define ipa_mkmask(x) ipv6_mkmask(x)
-#define ipa_mklen(x) ipv6_mklen(x)
+#define ipa_mklen(x) ipv6_mklen(&(x))
+#define ipa_hash(x) ipv6_hash(&(x))
+#define ipa_hton(x) ipv6_hton(&(x))
+#define ipa_ntoh(x) ipv6_ntoh(&(x))
+#define ipa_classify(x) ipv6_classify(&(x))
 
 ip_addr ipv6_mkmask(unsigned);
-unsigned ipv6_mklen(ip_addr);
+unsigned ipv6_mklen(ip_addr *);
+int ipv6_classify(ip_addr *);
+void ipv6_hton(ip_addr *);
+void ipv6_ntoh(ip_addr *);
+
+/* FIXME: Is this hash function uniformly distributed over standard routing tables? */
+static inline unsigned ipv6_hash(ip_addr *a)
+{
+  u32 x = _I0(*a) ^ _I1(*a) ^ _I2(*a) ^ _I3(*a);
+  return x ^ (x >> 16) ^ (x >> 8);
+}
 
 #endif