libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* net.cc (cygwin_getsockopt): Rearrange code slightly and handle 

TCP_NODELAY just like SO_KEEPALIVE and SO_DONTROUTE.
This commit is contained in:
Corinna Vinschen 2014-05-05 15:18:17 +00:00
parent 7e9b678464
commit 67797a9560
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-05-05 Corinna Vinschen <corinna@vinschen.de>
* net.cc (cygwin_getsockopt): Rearrange code slightly and handle
TCP_NODELAY just like SO_KEEPALIVE and SO_DONTROUTE.
2014-05-03 Christopher Faylor <me.cygwin2014@cgf.cx>
* spawn.cc (av::setup): Eat trailing whitespace on #! script.

43
winsup/cygwin/net.cc
View File

@ -923,32 +923,27 @@ cygwin_getsockopt (int fd, int level, int optname, void *optval,
(int *) optlen);
if (res == SOCKET_ERROR)
set_winsock_errno ();
else if (level == SOL_SOCKET)
else if (level == SOL_SOCKET && optname == SO_ERROR)
{
switch (optname)
int *e = (int *) optval;
debug_printf ("WinSock SO_ERROR = %d", *e);
*e = find_winsock_errno (*e);
}
else if (*optlen == 1)
{
/* Regression in Vista and later: instead of a 4 byte BOOL value,
a 1 byte BOOLEAN value is returned, in contrast to older systems
and the documentation. Since an int type is expected by the
calling application, we convert the result here. For some reason
only three BSD-compatible socket options seem to be affected. */
if ((level == SOL_SOCKET
&& (optname == SO_KEEPALIVE || optname == SO_DONTROUTE))
|| (level == IPPROTO_TCP && optname == TCP_NODELAY))
{
case SO_ERROR:
{
int *e = (int *) optval;
debug_printf ("WinSock SO_ERROR = %d", *e);
*e = find_winsock_errno (*e);
}
break;
case SO_KEEPALIVE:
case SO_DONTROUTE:
/* Regression in Vista and later: instead of a 4 byte BOOL
value, a 1 byte BOOLEAN value is returned, in contrast
to older systems and the documentation. Since an int
type is expected by the calling application, we convert
the result here. */
if (*optlen == 1)
{
BOOLEAN *in = (BOOLEAN *) optval;
int *out = (int *) optval;
*out = *in;
*optlen = 4;
}
break;
BOOLEAN *in = (BOOLEAN *) optval;
int *out = (int *) optval;
*out = *in;
*optlen = 4;
}
}
}

5
winsup/cygwin/release/1.7.30
View File

@ -34,3 +34,8 @@ Bug Fixes
when calling select on a dup'ed socket after an asynchronous connection
attempt.
Fixes: http://cygwin.com/ml/cygwin/2014-04/msg00510.html
- Workaround the problem that getsockopt(IPPROTO_TCP,TCP_NODELAY) returns
the option value as a 1 byte value, while BSD and Linux expect a 4 byte
value.
Fixes: http://cygwin.com/ml/cygwin/2014-04/msg00624.html