JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: sockets: Handle SO_RCVTIMEO and SO_SNDTIMEO

Browse Source 
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2018-02-07 16:16:51 +01:00
parent 51af517cab
commit c51a0b74dc
6 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
winsup/cygwin/net.cc
View File

@@ -851,6 +851,21 @@ cygwin_setsockopt (int fd, int level, int optname, const void *optval,
ignore = true;
break;
case SO_RCVTIMEO:
case SO_SNDTIMEO:
if (optlen < (socklen_t) sizeof (struct timeval))
{
set_errno (EINVAL);
__leave;
}
if (timeval_to_ms ((struct timeval *) optval,
(optname == SO_RCVTIMEO)
? fh->rcvtimeo () : fh->sndtimeo ()))
res = 0;
else
set_errno (EDOM);
__leave;
default:
break;
}
@@ -999,6 +1014,33 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval,
}
break;
case SO_RCVTIMEO:
case SO_SNDTIMEO:
{
struct timeval *time_out = (struct timeval *) optval;
if (*optlen < (socklen_t) sizeof *time_out)
{
set_errno (EINVAL);
__leave;
}
DWORD ms = (optname == SO_RCVTIMEO) ? fh->rcvtimeo ()
: fh->sndtimeo ();
if (ms == 0 || ms == INFINITE)
{
time_out->tv_sec = 0;
time_out->tv_usec = 0;
}
else
{
time_out->tv_sec = ms / HZ;
time_out->tv_usec = ((ms % HZ) * USPERSEC) / HZ;
}
*optlen = (socklen_t) sizeof *time_out;
res = 0;
__leave;
}
default:
break;
}