d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve some unexpected differences when comparing with the 2.2 version.

Browse Source 
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().
This commit is contained in:
Peter Wemm 1998-05-02 15:51:54 +00:00
parent c8d2fd6da8
commit 9e39714518
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=35624
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/net/res_send.c
View File

@ -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 @@ res_send(buf, buflen, ans, anssiz)
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 @@ res_send(buf, buflen, ans, anssiz)
(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) {