diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | support/resolv_test.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1c44a53c75..84b1937ce0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ (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. 2017-09-22 Joseph Myers <joseph@codesourcery.com> diff --git a/support/resolv_test.c b/support/resolv_test.c index 1625dcf43a..c3325b89b1 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); - size_t length = xrecvfrom (obj->servers[server_index].socket_udp, + ssize_t length = recvfrom (obj->servers[server_index].socket_udp, query, sizeof (query), 0, (struct sockaddr *) &peer, &peerlen); /* Check for termination. */ @@ -613,6 +613,12 @@ 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); |