unit test for addr_in_common.

git-svn-id: file:///svn/unbound/trunk@767 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 33bbd087a60c02dd8fcd65ecb73c6ec5c7f9bb52..a3e2e53ba399c40b9300031969bd0b4b8347fecc 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,7 @@
        - nice libevent not found error.
        - README talks about gnu make.
        - 0.8: unit test for addr_mask and fixups for it.
+         and unit test for addr_in_common().
 
 16 November 2007: Wouter
        - privilege separation is not needed in unbound at this time.

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index de7e8a0e3f8165253ed20843d95f7a8d548948a1..d822737e8116d2c0cdf5c3bfd39608724f4c705f 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -89,6 +89,42 @@ alloc_test() {
 static void 
 net_test()
 {
+       char* t4[] = {"\000\000\000\000",
+               "\200\000\000\000",
+               "\300\000\000\000",
+               "\340\000\000\000",
+               "\360\000\000\000",
+               "\370\000\000\000",
+               "\374\000\000\000",
+               "\376\000\000\000",
+               "\377\000\000\000",
+               "\377\200\000\000",
+               "\377\300\000\000",
+               "\377\340\000\000",
+               "\377\360\000\000",
+               "\377\370\000\000",
+               "\377\374\000\000",
+               "\377\376\000\000",
+               "\377\377\000\000",
+               "\377\377\200\000",
+               "\377\377\300\000",
+               "\377\377\340\000",
+               "\377\377\360\000",
+               "\377\377\370\000",
+               "\377\377\374\000",
+               "\377\377\376\000",
+               "\377\377\377\000",
+               "\377\377\377\200",
+               "\377\377\377\300",
+               "\377\377\377\340",
+               "\377\377\377\360",
+               "\377\377\377\370",
+               "\377\377\377\374",
+               "\377\377\377\376",
+               "\377\377\377\377",
+               "\377\377\377\377",
+               "\377\377\377\377",
+       };
        unit_assert( str_is_ip6("::") );
        unit_assert( str_is_ip6("::1") );
        unit_assert( str_is_ip6("2001:7b8:206:1:240:f4ff:fe37:8810") );
@@ -124,42 +160,6 @@ net_test()
                struct sockaddr_in6 a6;
                socklen_t l4 = (socklen_t)sizeof(a4);
                socklen_t l6 = (socklen_t)sizeof(a6);
-               char* t4[] = {"\000\000\000\000",
-                       "\200\000\000\000",
-                       "\300\000\000\000",
-                       "\340\000\000\000",
-                       "\360\000\000\000",
-                       "\370\000\000\000",
-                       "\374\000\000\000",
-                       "\376\000\000\000",
-                       "\377\000\000\000",
-                       "\377\200\000\000",
-                       "\377\300\000\000",
-                       "\377\340\000\000",
-                       "\377\360\000\000",
-                       "\377\370\000\000",
-                       "\377\374\000\000",
-                       "\377\376\000\000",
-                       "\377\377\000\000",
-                       "\377\377\200\000",
-                       "\377\377\300\000",
-                       "\377\377\340\000",
-                       "\377\377\360\000",
-                       "\377\377\370\000",
-                       "\377\377\374\000",
-                       "\377\377\376\000",
-                       "\377\377\377\000",
-                       "\377\377\377\200",
-                       "\377\377\377\300",
-                       "\377\377\377\340",
-                       "\377\377\377\360",
-                       "\377\377\377\370",
-                       "\377\377\377\374",
-                       "\377\377\377\376",
-                       "\377\377\377\377",
-                       "\377\377\377\377",
-                       "\377\377\377\377",
-               };
                int i;
                a4.sin_family = AF_INET;
                a6.sin6_family = AF_INET6;
@@ -181,6 +181,63 @@ net_test()
                addr_mask((struct sockaddr_storage*)&a6, l6, 0);
                unit_assert(memcmp(&a6.sin6_addr, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000", 16) == 0);
        }
+
+       /* test addr_in_common */
+       if(1) {
+               struct sockaddr_in a4, b4;
+               struct sockaddr_in6 a6, b6;
+               socklen_t l4 = (socklen_t)sizeof(a4);
+               socklen_t l6 = (socklen_t)sizeof(a6);
+               int i;
+               a4.sin_family = AF_INET;
+               b4.sin_family = AF_INET;
+               a6.sin6_family = AF_INET6;
+               b6.sin6_family = AF_INET6;
+               memcpy(&a4.sin_addr, "abcd", 4);
+               memcpy(&b4.sin_addr, "abcd", 4);
+               unit_assert(addr_in_common((struct sockaddr_storage*)&a4, 32,
+                       (struct sockaddr_storage*)&b4, 32, l4) == 32);
+               unit_assert(addr_in_common((struct sockaddr_storage*)&a4, 34,
+                       (struct sockaddr_storage*)&b4, 32, l4) == 32);
+               for(i=0; i<=32; i++) {
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a4, 32,
+                               (struct sockaddr_storage*)&b4, i, l4) == i);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a4, i,
+                               (struct sockaddr_storage*)&b4, 32, l4) == i);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a4, i,
+                               (struct sockaddr_storage*)&b4, i, l4) == i);
+               }
+               for(i=0; i<=32; i++) {
+                       memcpy(&a4.sin_addr, "\377\377\377\377", 4);
+                       memcpy(&b4.sin_addr, t4[i], 4);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a4, 32,
+                               (struct sockaddr_storage*)&b4, 32, l4) == i);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&b4, 32,
+                               (struct sockaddr_storage*)&a4, 32, l4) == i);
+               }
+               memcpy(&a6.sin6_addr, "abcdefghabcdefgh", 16);
+               memcpy(&b6.sin6_addr, "abcdefghabcdefgh", 16);
+               unit_assert(addr_in_common((struct sockaddr_storage*)&a6, 128,
+                       (struct sockaddr_storage*)&b6, 128, l6) == 128);
+               unit_assert(addr_in_common((struct sockaddr_storage*)&a6, 129,
+                       (struct sockaddr_storage*)&b6, 128, l6) == 128);
+               for(i=0; i<=128; i++) {
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a6, 128,
+                               (struct sockaddr_storage*)&b6, i, l6) == i);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a6, i,
+                               (struct sockaddr_storage*)&b6, 128, l6) == i);
+                       unit_assert(addr_in_common(
+                               (struct sockaddr_storage*)&a6, i,
+                               (struct sockaddr_storage*)&b6, i, l6) == i);
+               }
+       }
 }
 
 #include "util/rtt.h"