please doxygen

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

diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index f06603e8dfac88b7403113e2eb38e425d08d85da..68d5a309838f16637758e74771d7c0fb6da0d846 100644 (file)
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -48,6 +48,11 @@
 #include "util/data/msgreply.h"
 #include "util/data/dname.h"
 
+#ifndef PF_INET6
+/** define in case streamtcp is compiled on legacy systems */
+#define PF_INET6 10
+#endif
+
 /** usage information for streamtcp */
 void usage(char* argv[])
 {
@@ -73,10 +78,6 @@ open_svr(const char* svr, int udp)
                printf("fatal: bad server specs '%s'\n", svr);
                exit(1);
        }
-#ifndef PF_INET6
-/** define in case streamtcp is compiled on legacy systems */
-#define PF_INET6 10
-#endif
        fd = socket(addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET,
                udp?SOCK_DGRAM:SOCK_STREAM, 0);
        if(fd == -1) {

diff --git a/testcode/unitmain.c b/testcode/unitmain.c
index 2204dff670c7e00e0daa65c93b989b42bf86b9b3..6409aa811064ecc69eeb7f52d96ea75c38189285 100644 (file)
--- a/testcode/unitmain.c
+++ b/testcode/unitmain.c
@@ -243,6 +243,27 @@ net_test()
                                (struct sockaddr_storage*)&b6, i, l6) == i);
                }
        }
+       /* test sockaddr_cmp_addr */
+       unit_show_func("util/net_help.c", "sockaddr_cmp_addr");
+       if(1) {
+               struct sockaddr_storage a, b;
+               socklen_t alen = (socklen_t)sizeof(a);
+               socklen_t blen = (socklen_t)sizeof(b);
+               unit_assert(ipstrtoaddr("127.0.0.0", 53, &a, &alen));
+               unit_assert(ipstrtoaddr("127.255.255.255", 53, &b, &blen));
+               unit_assert(sockaddr_cmp_addr(&a, alen, &b, blen) == -1);
+               unit_assert(sockaddr_cmp_addr(&b, blen, &a, alen) == +1);
+               unit_assert(sockaddr_cmp_addr(&a, alen, &a, alen) == 0);
+               unit_assert(sockaddr_cmp_addr(&b, blen, &b, blen) == 0);
+               unit_assert(ipstrtoaddr("192.168.121.5", 53, &a, &alen));
+               unit_assert(sockaddr_cmp_addr(&a, alen, &b, blen) == +1);
+               unit_assert(sockaddr_cmp_addr(&b, blen, &a, alen) == -1);
+               unit_assert(sockaddr_cmp_addr(&a, alen, &a, alen) == 0);
+               unit_assert(ipstrtoaddr("2001:3578:ffeb::99", 53, &b, &blen));
+               unit_assert(sockaddr_cmp_addr(&b, blen, &b, blen) == 0);
+               unit_assert(sockaddr_cmp_addr(&a, alen, &b, blen) == -1);
+               unit_assert(sockaddr_cmp_addr(&b, blen, &a, alen) == +1);
+       }
        /* test addr_is_ip4mapped */
        unit_show_func("util/net_help.c", "addr_is_ip4mapped");
        if(1) {