diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-09-25 20:47:51 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2017-09-25 20:47:51 +0200 |
| commit | 5af1e931bfaf8ef28abd94c0c0ad14e4790cf429 (patch) | |
| tree | 9990cec1ebdbbca1f363e8f19632df49ea980763 | |
| parent | 9947638d74f490b8ec9a1563c195881a4151bd80 (diff) | |
| download | glibc-5af1e931bfaf8ef28abd94c0c0ad14e4790cf429.tar.gz glibc-5af1e931bfaf8ef28abd94c0c0ad14e4790cf429.tar.xz glibc-5af1e931bfaf8ef28abd94c0c0ad14e4790cf429.zip | |
Revert "resolv_test.c: also cope with CONNREFUSED errors returned by recvfrom"
This reverts commit 6174537c24cfe324d6e8f5a2a421883df12b8b6a.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | support/resolv_test.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 7bbc86482f..86cd508e3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/support/resolv_test.c b/support/resolv_test.c index c3325b89b1..1625dcf43a 100644 --- a/support/resolv_test.c +++ b/support/resolv_test.c @@ -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); |