Commit a7f39e3f authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

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

parent 8aaef4ca
...@@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ...@@ -1610,6 +1610,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_SO_KEEPALIVE: case IOCTL_AFD_WINE_GET_SO_KEEPALIVE:
return do_getsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, out_buffer, out_size ); 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: default:
{ {
if ((code >> 16) == FILE_DEVICE_NETWORK) if ((code >> 16) == FILE_DEVICE_NETWORK)
......
...@@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, ...@@ -3555,6 +3555,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
SetLastError( WSAENOPROTOOPT ); SetLastError( WSAENOPROTOOPT );
return -1; 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 /* Some options need some conversion before they can be sent to
* setsockopt. The conversions are done here, then they will fall through * setsockopt. The conversions are done here, then they will fall through
* to the general case. Special options that are not passed to * 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, ...@@ -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 options listed here don't need any special handling. Thanks to
* the conversion happening above, options from there will fall through * the conversion happening above, options from there will fall through
* to this, too.*/ * to this, too.*/
case WS_SO_KEEPALIVE:
case WS_SO_OOBINLINE: case WS_SO_OOBINLINE:
/* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics. /* 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 * however, using it the BSD way fixes bug 8513 and seems to be what
......
...@@ -164,6 +164,7 @@ struct afd_get_events_params ...@@ -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_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_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_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 struct afd_create_params
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment