Zebediah Figura : ws2_32: Move the setsockopt(IP_BLOCK_SOURCE) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Fri Jul 2 14:46:38 CDT 2021
Module: wine
Branch: master
Commit: 1276c73febdd99e9574cdc02cc5a3eafc82dbb35
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1276c73febdd99e9574cdc02cc5a3eafc82dbb35
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Jul 1 17:10:26 2021 -0500
ws2_32: Move the setsockopt(IP_BLOCK_SOURCE) implementation to ntdll.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/socket.c | 3 +++
dlls/ws2_32/socket.c | 4 +++-
include/wine/afd.h | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index e9d275e1b41..8b140ce4930 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1681,6 +1681,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP:
return do_setsockopt( handle, io, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, in_buffer, in_size );
+ case IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE:
+ return do_setsockopt( handle, io, IPPROTO_IP, IP_BLOCK_SOURCE, in_buffer, in_size );
+
default:
{
if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 2ff18e3cd7d..00b83d06478 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3630,8 +3630,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_ADD_SOURCE_MEMBERSHIP:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP, optval, optlen );
- case WS_IP_DROP_SOURCE_MEMBERSHIP:
case WS_IP_BLOCK_SOURCE:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE, optval, optlen );
+
+ case WS_IP_DROP_SOURCE_MEMBERSHIP:
case WS_IP_UNBLOCK_SOURCE:
{
WS_IP_MREQ_SOURCE* val = (void*)optval;
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 2e4123e3611..4ed75067264 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -183,6 +183,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO WINE_AFD_IOC(238)
#define IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP WINE_AFD_IOC(239)
#define IOCTL_AFD_WINE_SET_IP_ADD_SOURCE_MEMBERSHIP WINE_AFD_IOC(240)
+#define IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE WINE_AFD_IOC(241)
struct afd_create_params
{
More information about the wine-cvs
mailing list