ipv6 test working for windows.

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

diff --git a/doc/Changelog b/doc/Changelog
index b030e1e92ab729c4bd11758912c0995802ccea9c..f9f9388079474850b68e1b27f5a4abd01164f573 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,8 @@
 24 June 2008: Wouter
        - removed testcode/checklocks from production code compilation path.
+       - streamtcp can use UDP mode (connected UDP socket), for testing IPv6
+         on windows.
+       - fwd_ancil test fails if platform support is lacking.
 
 23 June 2008: Wouter
        - fixup minitpkg to cleanup on windows with its file locking troubles.

diff --git a/testcode/do-tests.sh b/testcode/do-tests.sh
index 4c13c9fb82e6269ef42265d0c13b59881a759b99..a52e0c7ce5d1e9684217d1919f1be9a35a8046d1 100755 (executable)
--- a/testcode/do-tests.sh
+++ b/testcode/do-tests.sh
@@ -23,6 +23,7 @@ if dig @::1 -v >/dev/null 2>&1; then
 else
        HAVE_IPV6=no
 fi
+HAVE_IPV6=yes
 
 cd testdata;
 sh ../testcode/mini_tpkg.sh clean

diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
index f646cb5192b9268e6ff8d6c27a5cd94f6d377be4..0b93835e8b592be73b86e46deb0e72ddef06ea1e 100644 (file)
--- a/testcode/streamtcp.c
+++ b/testcode/streamtcp.c
@@ -54,13 +54,15 @@ void usage(char* argv[])
        printf("usage: %s [options] name type class ...\n", argv[0]);
        printf("        sends the name-type-class queries over TCP.\n");
        printf("-f server       what ipaddr@portnr to send the queries to\n");
+       printf("-u              use UDP. No retries are attempted.\n");
+       printf("-n              do not wait for an answer.\n");
        printf("-h              this help text\n");
        exit(1);
 }
 
 /** open TCP socket to svr */
 static int
-open_svr(char* svr)
+open_svr(char* svr, int udp)
 {
        struct sockaddr_storage addr;
        socklen_t addrlen;
@@ -71,7 +73,7 @@ open_svr(char* svr)
                exit(1);
        }
        fd = socket(addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET,
-               SOCK_STREAM, 0);
+               udp?SOCK_DGRAM:SOCK_STREAM, 0);
        if(fd == -1) {
 #ifndef USE_WINSOCK
                perror("socket() error");
@@ -93,7 +95,7 @@ open_svr(char* svr)
 
 /** write a query over the TCP fd */
 static void
-write_q(int fd, ldns_buffer* buf, int id, 
+write_q(int fd, int udp, ldns_buffer* buf, int id, 
        char* strname, char* strtype, char* strclass)
 {
        struct query_info qinfo;
@@ -121,15 +123,18 @@ write_q(int fd, ldns_buffer* buf, int id,
        ldns_buffer_write_u16_at(buf, 2, BIT_RD);
 
        /* send it */
-       len = (uint16_t)ldns_buffer_limit(buf);
-       len = htons(len);
-       if(send(fd, (void*)&len, sizeof(len), 0) < (ssize_t)sizeof(len)) {
+       if(!udp) {
+               len = (uint16_t)ldns_buffer_limit(buf);
+               len = htons(len);
+               if(send(fd, (void*)&len, sizeof(len), 0)<(ssize_t)sizeof(len)){
 #ifndef USE_WINSOCK
-               perror("send() len failed");
+                       perror("send() len failed");
 #else
-               printf("send len: %s\n", wsa_strerror(WSAGetLastError()));
+                       printf("send len: %s\n", 
+                               wsa_strerror(WSAGetLastError()));
 #endif
-               exit(1);
+                       exit(1);
+               }
        }
        if(send(fd, ldns_buffer_begin(buf), ldns_buffer_limit(buf), 0) < 
                (ssize_t)ldns_buffer_limit(buf)) {
@@ -146,29 +151,47 @@ write_q(int fd, ldns_buffer* buf, int id,
 
 /** receive DNS datagram over TCP and print it */
 static void
-recv_one(int fd, ldns_buffer* buf)
+recv_one(int fd, int udp, ldns_buffer* buf)
 {
        uint16_t len;
        ldns_pkt* pkt;
        ldns_status status;
-       if(recv(fd, (void*)&len, sizeof(len), 0) < (ssize_t)sizeof(len)) {
+       if(!udp) {
+               if(recv(fd, (void*)&len, sizeof(len), 0)<(ssize_t)sizeof(len)){
 #ifndef USE_WINSOCK
-               perror("read() len failed");
+                       perror("read() len failed");
 #else
-               printf("read len: %s\n", wsa_strerror(WSAGetLastError()));
+                       printf("read len: %s\n", 
+                               wsa_strerror(WSAGetLastError()));
 #endif
-               exit(1);
-       }
-       len = ntohs(len);
-       ldns_buffer_clear(buf);
-       ldns_buffer_set_limit(buf, len);
-       if(recv(fd, ldns_buffer_begin(buf), len, 0) < (ssize_t)len) {
+                       exit(1);
+               }
+               len = ntohs(len);
+               ldns_buffer_clear(buf);
+               ldns_buffer_set_limit(buf, len);
+               if(recv(fd, ldns_buffer_begin(buf), len, 0) < (ssize_t)len) {
 #ifndef USE_WINSOCK
-               perror("read() data failed");
+                       perror("read() data failed");
 #else
-               printf("read data: %s\n", wsa_strerror(WSAGetLastError()));
+                       printf("read data: %s\n", 
+                               wsa_strerror(WSAGetLastError()));
 #endif
-               exit(1);
+                       exit(1);
+               }
+       } else {
+               ssize_t l;
+               ldns_buffer_clear(buf);
+               if((l=recv(fd, ldns_buffer_begin(buf), 
+                       ldns_buffer_capacity(buf), 0)) < 0) {
+#ifndef USE_WINSOCK
+                       perror("read() data failed");
+#else
+                       printf("read data: %s\n", 
+                               wsa_strerror(WSAGetLastError()));
+#endif
+                       exit(1);
+               }
+               ldns_buffer_set_limit(buf, l);
        }
        printf("\nnext received packet\n");
        log_buf(0, "data", buf);
@@ -186,17 +209,18 @@ recv_one(int fd, ldns_buffer* buf)
 
 /** send the TCP queries and print answers */
 static void
-send_em(char* svr, int num, char** qs)
+send_em(char* svr, int udp, int noanswer, int num, char** qs)
 {
        ldns_buffer* buf = ldns_buffer_new(65553);
-       int fd = open_svr(svr);
+       int fd = open_svr(svr, udp);
        int i;
        if(!buf) fatal_exit("out of memory");
        for(i=0; i<num; i+=3) {
                printf("\nNext query is %s %s %s\n", qs[i], qs[i+1], qs[i+2]);
-               write_q(fd, buf, i, qs[i], qs[i+1], qs[i+2]);
+               write_q(fd, udp, buf, i, qs[i], qs[i+1], qs[i+2]);
                /* print at least one result */
-               recv_one(fd, buf);
+               if(!noanswer)
+                       recv_one(fd, udp, buf);
        }
 
        close(fd);
@@ -227,6 +251,9 @@ int main(int argc, char** argv)
 {
        int c;
        char* svr = "127.0.0.1";
+       int udp = 0;
+       int noanswer = 0;
+
 #ifdef USE_WINSOCK
        WSADATA wsa_data;
        if(WSAStartup(MAKEWORD(2,2), &wsa_data) != 0) {
@@ -250,11 +277,17 @@ int main(int argc, char** argv)
        if(argc == 1) {
                usage(argv);
        }
-       while( (c=getopt(argc, argv, "f:h")) != -1) {
+       while( (c=getopt(argc, argv, "f:hnu")) != -1) {
                switch(c) {
                        case 'f':
                                svr = optarg;
                                break;
+                       case 'n':
+                               noanswer = 1;
+                               break;
+                       case 'u':
+                               udp = 1;
+                               break;
                        case 'h':
                        case '?':
                        default:
@@ -268,7 +301,7 @@ int main(int argc, char** argv)
                printf("queries must be multiples of name,type,class\n");
                return 1;
        }
-       send_em(svr, argc, argv);
+       send_em(svr, udp, noanswer, argc, argv);
        checklock_stop();
 #ifdef USE_WINSOCK
        WSACleanup();

diff --git a/testdata/fwd_ancil.tpkg b/testdata/fwd_ancil.tpkg
index a9639bad3d2efa3f5675c2e0186cf025ee083c76..1ce1131c728ea85a620189139db801ee3f495f42 100644 (file)
Binary files a/testdata/fwd_ancil.tpkg and b/testdata/fwd_ancil.tpkg differ

diff --git a/testdata/fwd_tcp_tc6.tpkg b/testdata/fwd_tcp_tc6.tpkg
index b24fccff11d4b7aaaacd7c011e8256e5bd8d9f65..f99b815287b3ba7488b2caeb754109ca1e22612b 100644 (file)
Binary files a/testdata/fwd_tcp_tc6.tpkg and b/testdata/fwd_tcp_tc6.tpkg differ