picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "resolv_test.c: also cope with CONNREFUSED errors returned by recvfrom"

Browse source 
This reverts commit 6174537c24.
This commit is contained in:
Samuel Thibault 2017-09-25 20:47:51 +02:00
parent 9947638d74
commit 5af1e931bf
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -82,8 +82,6 @@
(CMSG_FIRSTHDR, __cmsg_nxthdr): Use (struct cmsghdr *) 0 instead of
NULL.
* bits/socket.h: Likewise.
* support/resolv_test.c (server_thread_udp_process_one): Call recvfrom
instead of xrecvfrom, and ignore ECONNREFUSED errors.
* sysdeps/unix/clock_gettime.c (realtime_gettime, __clock_gettime): Use
__gettimeofday instead of gettimeofday.
* sysdeps/unix/clock_settime.c (__clock_settime): Use __settimeofday

8
support/resolv_test.c
View file

@ -600,7 +600,7 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
unsigned char query[512];
struct sockaddr_storage peer;
socklen_t peerlen = sizeof (peer);
ssize_t length = recvfrom (obj->servers[server_index].socket_udp,
size_t length = xrecvfrom (obj->servers[server_index].socket_udp,
query, sizeof (query), 0,
(struct sockaddr *) &peer, &peerlen);
/* Check for termination. */
@ -613,12 +613,6 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
return false;
}
if (length < 0)
{
/* The other end had closed the socket, and we are notified only now. */
TEST_VERIFY_EXIT (errno == ECONNREFUSED);
return true;
}
struct query_info qinfo;
parse_query (&qinfo, query, length);