diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-06-27 13:29:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-06-27 13:29:37 +0000 |
| commit | cd68221f28ca1eb29b6e6827f437f5691bd21fb2 (patch) | |
| tree | e588ae7e274e5e086bc21eec5588ac9042a1c96d /resolv/res_send.c | |
| parent | 19c36e333722962398eb281fd7201ac45f5eb572 (diff) | |
| download | glibc-cd68221f28ca1eb29b6e6827f437f5691bd21fb2.zip glibc-cd68221f28ca1eb29b6e6827f437f5691bd21fb2.tar.gz glibc-cd68221f28ca1eb29b6e6827f437f5691bd21fb2.tar.bz2 | |
Update.
1998-06-25 Andi Kleen <ak@muc.de>
* inet/rcmd.c (rcmd): Change to use __poll instead of select.
* resolv/res_send.c (res_send): Likewise.
Diffstat (limited to 'resolv/res_send.c')
| -rw-r--r-- | resolv/res_send.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/resolv/res_send.c b/resolv/res_send.c index e5c6e03..38e1e05 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -71,6 +71,7 @@ static char rcsid[] = "$Id$"; #include <sys/types.h> #include <sys/param.h> +#include <sys/poll.h> #include <sys/time.h> #include <sys/socket.h> #include <sys/uio.h> @@ -98,16 +99,6 @@ static int s = -1; /* socket used for communications */ static int connected = 0; /* is the socket connected */ static int vc = 0; /* is the socket a virtual circuit? */ -#ifndef FD_SET -/* XXX - should be in portability.h */ -#define NFDBITS 32 -#define FD_SETSIZE 32 -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) -#endif - /* XXX - this should be done in portability.h */ #if (defined(BSD) && (BSD >= 199103)) || defined(linux) # define CAN_RECONNECT 1 @@ -519,7 +510,7 @@ read_len: /* * Use datagrams. */ - struct timeval timeout; + int timeout; fd_set dsmask; struct sockaddr_in from; socklen_t fromlen; @@ -619,26 +610,24 @@ read_len: /* * Wait for reply */ - timeout.tv_sec = (_res.retrans << try); + timeout = (_res.retrans << try) * 1000; if (try > 0) - timeout.tv_sec /= _res.nscount; - if ((long) timeout.tv_sec <= 0) - timeout.tv_sec = 1; - timeout.tv_usec = 0; + timeout /= _res.nscount; + if (timeout <= 0) + timeout = 1000; wait: if (s < 0 || s >= FD_SETSIZE) { Perror(stderr, "s out-of-bounds", EMFILE); res_close(); goto next_ns; } - FD_ZERO(&dsmask); - FD_SET(s, &dsmask); - n = select(s+1, &dsmask, (fd_set *)NULL, - (fd_set *)NULL, &timeout); + pfd[0].fd = s; + pfd[0].events = POLLIN; + n = __poll(pfd, 1, timeout); if (n < 0) { if (errno == EINTR) goto wait; - Perror(stderr, "select", errno); + Perror(stderr, "poll", errno); res_close(); goto next_ns; } |