From 144b94fa40f4ee892bbb9a36e8ab1517d1ba4069 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sat, 14 Sep 2002 18:31:06 +0000 Subject: 2002-09-14 Joel Sherrill * kern/uipc_socket.c: Fix case on SO_RCVTIMEO and SO_SNDTIMEO where conversion into ticks can result in a 0 ticks timeout which is the same as requesting no timeout. Reported by Sergei Organov . --- cpukit/libnetworking/ChangeLog | 7 +++++++ cpukit/libnetworking/kern/uipc_socket.c | 2 ++ 2 files changed, 9 insertions(+) (limited to 'cpukit/libnetworking') diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index ff0764f11f..5dcc28b4bc 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,10 @@ +2002-09-14 Joel Sherrill + + * kern/uipc_socket.c: Fix case on SO_RCVTIMEO and SO_SNDTIMEO where + conversion into ticks can result in a 0 ticks timeout which is + the same as requesting no timeout. Reported by Sergei Organov + . + 2002-09-14 Vyacheslav V. Burdjanadze * kern/uipc_mbuf.c, sys/mbuf.h, netinet/udp_usrreq.c: Add diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c index 49a5a65653..b8671a2a0d 100644 --- a/cpukit/libnetworking/kern/uipc_socket.c +++ b/cpukit/libnetworking/kern/uipc_socket.c @@ -961,6 +961,8 @@ sosetopt(so, level, optname, m0) goto bad; } val = tv->tv_sec * hz + tv->tv_usec / tick; + if (val == 0) + val = 1; switch (optname) { -- cgit v1.2.3