system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 16:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ws2_32: Move the setsockopt(SO_KEEPALIVE) implementation to ntdll.

Browse source 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-06-24 00:00:15 -05:00 committed by Alexandre Julliard
parent 8aaef4cafd
commit a7f39e3fbb
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/ntdll/unix/socket.c
View file

@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_SO_KEEPALIVE:
return do_getsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, out_buffer, out_size );
case IOCTL_AFD_WINE_SET_SO_KEEPALIVE:
return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size );
default:
{
if ((code >> 16) == FILE_DEVICE_NETWORK)

4
dlls/ws2_32/socket.c
View file

@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
SetLastError( WSAENOPROTOOPT );
return -1;
case WS_SO_KEEPALIVE:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen );
/* Some options need some conversion before they can be sent to
* setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to
@ -3610,7 +3613,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
/* The options listed here don't need any special handling. Thanks to
* the conversion happening above, options from there will fall through
* to this, too.*/
case WS_SO_KEEPALIVE:
case WS_SO_OOBINLINE:
/* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics.
* however, using it the BSD way fixes bug 8513 and seems to be what

1
include/wine/afd.h
View file

@ -164,6 +164,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS)
struct afd_create_params
{