diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | resolv/res_send.c | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,7 @@ 2004-10-24 Ulrich Drepper <drepper@redhat.com> + * resolv/res_send.c (send_dg): Cope with failures. + * include/libc-symbols.h: Define hidden attribute macros for libnss_files. * include/netdb.h: Use libnss_files_hidden_proto for the parsers diff --git a/resolv/res_send.c b/resolv/res_send.c index 18e54db..8fb21a9 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -906,7 +906,7 @@ send_dg(res_state statp, goto wait; } } - Perror(statp, stderr, "select", errno); + Perror(statp, stderr, "poll", errno); res_nclose(statp); return (0); } @@ -922,9 +922,7 @@ send_dg(res_state statp, pfd[0].events = POLLIN; ++nwritten; goto wait; - } else { - assert(pfd[0].revents & POLLIN); - + } else if (pfd[0].revents & POLLIN) { fromlen = sizeof(struct sockaddr_in6); if (anssiz < MAXPACKET && anscp @@ -1030,6 +1028,10 @@ send_dg(res_state statp, * next nameserver ought not be tried. */ return (resplen); + } else if (pfd[0].revents & (POLLERR | POLLHUP | POLLNVAL)) { + /* Something went wrong. We can stop trying. */ + res_nclose(statp); + return (0); } } |