IP: Getting and setting bits from ip_addr

diff --git a/filter/trie.c b/filter/trie.c
index 12ba0b82b10bf4b89c760f8efbe751d12a5bc0dc..a3ac231b59d47e8756e9106425b323c64718bbff 100644 (file)
--- a/filter/trie.c
+++ b/filter/trie.c
@@ -126,7 +126,6 @@
 #define ipa_mkmask(x) ip6_mkmask(x)
 #define ipa_masklen(x) ip6_masklen(&x)
 #define ipa_pxlen(x,y) ip6_pxlen(x,y)
-#define ipa_getbit(a,p) ip6_getbit(a,p)
 #define ipa_getbits(a,p,n) ip6_getbits(a,p,n)
 #define ipa_setbits(a,p,n) ip6_setbits(a,p,n)
 #define trie_local_mask(a,b,c) trie_local_mask6(a,b,c)

diff --git a/lib/ip.h b/lib/ip.h
index 0e232f97955a2e1e5661b66112776663ec41736b..17a17d7329f929bb2f14b10757333b44b4a17784 100644 (file)
--- a/lib/ip.h
+++ b/lib/ip.h
@@ -368,6 +368,10 @@ ip4_addr ip4_class_mask(ip4_addr ad);
 #define ipa_opposite_m1(x) ip6_opposite_m1(x)
 #define ipa_opposite_m2(x) ip6_opposite_m2(x)
 
+#define ipa_getbit(a, pos) ip6_getbit(a, pos)
+#define ipa_setbit(a, pos) ip6_setbit(a, pos)
+#define ipa_clrbit(a, pos) ip6_clrbit(a, pos)
+
 
 /*
  *     Host/network order conversions