Zebediah Figura : ws2_32: Move the setsockopt(IP_DROP_MEMBERSHIP) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Wed Jul 7 15:01:29 CDT 2021
Module: wine
Branch: master
Commit: af3efd38ab11fdec33bf5335b61750cfd259d6a7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3efd38ab11fdec33bf5335b61750cfd259d6a7
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jul 6 23:48:44 2021 -0500
ws2_32: Move the setsockopt(IP_DROP_MEMBERSHIP) implementation to ntdll.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.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 3f2dfe7c1f2..04917d19e92 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1736,6 +1736,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
}
#endif
+ case IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP:
+ return do_setsockopt( handle, io, IPPROTO_IP, IP_DROP_MEMBERSHIP, 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 10e79d3f8ff..48b9fe8c594 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3637,6 +3637,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_DONTFRAGMENT:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT, optval, optlen );
+ case WS_IP_DROP_MEMBERSHIP:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP, optval, optlen );
+
case WS_IP_DROP_SOURCE_MEMBERSHIP:
case WS_IP_UNBLOCK_SOURCE:
{
@@ -3651,7 +3654,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
convert_sockopt(&level, &optname);
break;
}
- case WS_IP_DROP_MEMBERSHIP:
#ifdef IP_HDRINCL
case WS_IP_HDRINCL:
#endif
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 5b4114f4d77..c660e982d0e 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -186,6 +186,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_SET_IP_BLOCK_SOURCE WINE_AFD_IOC(241)
#define IOCTL_AFD_WINE_GET_IP_DONTFRAGMENT WINE_AFD_IOC(242)
#define IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT WINE_AFD_IOC(243)
+#define IOCTL_AFD_WINE_SET_IP_DROP_MEMBERSHIP WINE_AFD_IOC(244)
struct afd_create_params
{
More information about the wine-cvs
mailing list