unit test, testbound, basic udp and tcp tests are working on XP.

ipv6 not supported by OS is a warning (nonfatal).

git-svn-id: file:///svn/unbound/trunk@1127 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards
2008-06-18 14:27:30 +00:00
parent 7be0e5b814
commit fc3fc7a1f3
12 changed files with 341 additions and 49 deletions
+40 -6
View File
@@ -73,11 +73,19 @@ open_svr(char* svr)
fd = socket(addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET,
SOCK_STREAM, 0);
if(fd == -1) {
#ifndef USE_WINSOCK
perror("socket() error");
#else
printf("socket: %s\n", wsa_strerror(WSAGetLastError()));
#endif
exit(1);
}
if(connect(fd, (struct sockaddr*)&addr, addrlen) < 0) {
#ifndef USE_WINSOCK
perror("connect() error");
#else
printf("connect: %s\n", wsa_strerror(WSAGetLastError()));
#endif
exit(1);
}
return fd;
@@ -115,13 +123,21 @@ write_q(int fd, ldns_buffer* buf, int id,
/* send it */
len = (uint16_t)ldns_buffer_limit(buf);
len = htons(len);
if(write(fd, &len, sizeof(len)) < (ssize_t)sizeof(len)) {
perror("write() len failed");
if(send(fd, (void*)&len, sizeof(len), 0) < (ssize_t)sizeof(len)) {
#ifndef USE_WINSOCK
perror("send() len failed");
#else
printf("send len: %s\n", wsa_strerror(WSAGetLastError()));
#endif
exit(1);
}
if(write(fd, ldns_buffer_begin(buf), ldns_buffer_limit(buf)) <
if(send(fd, ldns_buffer_begin(buf), ldns_buffer_limit(buf), 0) <
(ssize_t)ldns_buffer_limit(buf)) {
perror("write() data failed");
#ifndef USE_WINSOCK
perror("send() data failed");
#else
printf("send data: %s\n", wsa_strerror(WSAGetLastError()));
#endif
exit(1);
}
@@ -135,15 +151,23 @@ recv_one(int fd, ldns_buffer* buf)
uint16_t len;
ldns_pkt* pkt;
ldns_status status;
if(read(fd, &len, sizeof(len)) < (ssize_t)sizeof(len)) {
if(recv(fd, (void*)&len, sizeof(len), 0) < (ssize_t)sizeof(len)) {
#ifndef USE_WINSOCK
perror("read() len failed");
#else
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(read(fd, ldns_buffer_begin(buf), len) < (ssize_t)len) {
if(recv(fd, ldns_buffer_begin(buf), len, 0) < (ssize_t)len) {
#ifndef USE_WINSOCK
perror("read() data failed");
#else
printf("read data: %s\n", wsa_strerror(WSAGetLastError()));
#endif
exit(1);
}
printf("\nnext received packet\n");
@@ -203,6 +227,13 @@ int main(int argc, char** argv)
{
int c;
char* svr = "127.0.0.1";
#ifdef USE_WINSOCK
WSADATA wsa_data;
if(WSAStartup(MAKEWORD(2,2), &wsa_data) != 0) {
printf("WSAStartup failed\n");
return 1;
}
#endif
/* lock debug start (if any) */
log_init(0, 0, 0);
@@ -239,5 +270,8 @@ int main(int argc, char** argv)
}
send_em(svr, argc, argv);
checklock_stop();
#ifdef USE_WINSOCK
WSACleanup();
#endif
return 0;
}