diff options
| author | peter <peter@FreeBSD.org> | 1998-05-02 15:51:54 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-05-02 15:51:54 +0000 |
| commit | da6a2015e3efa30106a86237106de455d889dc3a (patch) | |
| tree | 39b59f301602308082082987480bba244675c909 /lib/libc/net | |
| parent | 119bf1955726447fe80a4419229bf6ca6a606026 (diff) | |
| download | FreeBSD-src-da6a2015e3efa30106a86237106de455d889dc3a.zip FreeBSD-src-da6a2015e3efa30106a86237106de455d889dc3a.tar.gz | |
Resolve some unexpected differences when comparing with the 2.2 version.
One bug was relatively harmless (select's timeout had an uninitialized
tv_usec), the other I'm not so sure.. (neglected to catch select returns
less than zero). Both of these were irrelevant on kernels with poll().
Diffstat (limited to 'lib/libc/net')
| -rw-r--r-- | lib/libc/net/res_send.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index b8acbfd..a29f43a 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -56,7 +56,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; static char orig_rcsid[] = "From: Id: res_send.c,v 8.14 1998/04/07 04:59:46 vixie Exp $"; -static char rcsid[] = "$Id: res_send.c,v 1.20 1997/09/16 06:03:54 peter Exp $"; +static char rcsid[] = "$Id: res_send.c,v 1.21 1998/05/02 13:11:02 peter Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -607,11 +607,12 @@ read_len: if (msec <= 0) msec = 1000; } else { - timeout.tv_sec = (_res.retrans << try); + timeout.tv_sec = (_res.retrans << try); if (try > 0) timeout.tv_sec /= _res.nscount; if ((long) timeout.tv_sec <= 0) timeout.tv_sec = 1; + timeout.tv_usec = 0; } wait: if (s < 0) { @@ -669,6 +670,13 @@ read_len: (fd_set *)NULL, &timeout); if (dsmaskp != &dsmask) free(dsmaskp); + if (n < 0) { + if (errno == EINTR) + goto wait; + Perror(stderr, "select", errno); + res_close(); + goto next_ns; + } } if (n == 0) { |
