lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

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

Browse Source 
server_thread_udp_process_one already takes care of calling sendto()
instead of xsendto to be able to ignore the case where the client has
closed the socket.  Depending on the TCP/IP stack behavior, this error
could be notified later through recvfrom(), so we need to ignore it
there too.

* support/resolv_test.c (server_thread_udp_process_one): Call recvfrom
instead of xrecvfrom, and ignore ECONNREFUSED errors.
This commit is contained in:
Samuel Thibault
2017-09-10 17:41:03 +02:00
parent b38a42a098
commit 6174537c24
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -15,6 +15,8 @@
(CMSG_FIRSTHDR, __cmsg_nxthdr): Use (struct cmsghdr *) 0 instead of (CMSG_FIRSTHDR, __cmsg_nxthdr): Use (struct cmsghdr *) 0 instead of
NULL. NULL.
* bits/socket.h: Likewise. * 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> 2017-09-22 Joseph Myers <joseph@codesourcery.com>

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]; unsigned char query[512];
struct sockaddr_storage peer; struct sockaddr_storage peer;
socklen_t peerlen = sizeof (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, query, sizeof (query), 0,
(struct sockaddr *) &peer, &peerlen); (struct sockaddr *) &peer, &peerlen);
/* Check for termination. */ /* Check for termination. */
@@ -613,6 +613,12 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index)
return false; 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; struct query_info qinfo;
parse_query (&qinfo, query, length); parse_query (&qinfo, query, length);