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

Lite2 bugfixes merge:

Browse Source 
so_linger is in seconds, not in 1/HZ
range checking in SO_*TIMEO was wrong

PR: 11252
This commit is contained in:
Andrey A. Chernov 1999-04-24 18:22:34 +00:00
parent fdbad643d5
commit 02a3d5261d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/uipc_socket.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
* $Id: uipc_socket.c,v 1.54 1999/02/02 07:23:28 fenner Exp $
* $Id: uipc_socket.c,v 1.55 1999/02/16 10:49:49 dfr Exp $
*/
#include <sys/param.h>
@ -258,7 +258,7 @@ soclose(so)
goto drop;
while (so->so_state & SS_ISCONNECTED) {
error = tsleep((caddr_t)&so->so_timeo,
PSOCK | PCATCH, "soclos", so->so_linger);
PSOCK | PCATCH, "soclos", so->so_linger * hz);
if (error)
break;
}
@ -1049,7 +1049,7 @@ sosetopt(so, sopt)
if (error)
goto bad;
if (tv.tv_sec > SHRT_MAX / hz - hz) {
if (tv.tv_sec * hz + tv.tv_usec / tick > SHRT_MAX) {
error = EDOM;
goto bad;
}