From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 1 Feb 2010 09:38:50 +0000 (+0000)
Subject: please doxygen
X-Git-Tag: release-1.4.2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27090c3ea7417bcce255be49c3ee0a57498c0f1e;p=thirdparty%2Funbound.git

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 f06603e8d..68d5a3098 100644
--- 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 2204dff67..6409aa811 100644
--- 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) {