Zebediah Figura : ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Thu Jul 29 16:37:51 CDT 2021
Module: wine
Branch: master
Commit: a3f3ecf1266004294c5a4acf9b82580146a0315f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3f3ecf1266004294c5a4acf9b82580146a0315f
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Wed Jul 28 16:18:11 2021 -0500
ws2_32: Move the setsockopt(IPV6_MULTICAST_IF) 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 | 2 ++
include/wine/afd.h | 1 +
3 files changed, 6 insertions(+)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index f0876c4c13a..123b5323674 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1873,6 +1873,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF:
return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, out_buffer, out_size );
+ case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF:
+ return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_IF, 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 e41c5983e48..8548e7bf3a7 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3633,6 +3633,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen );
case WS_IPV6_MULTICAST_IF:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen );
+
case WS_IPV6_MULTICAST_LOOP:
case WS_IPV6_UNICAST_HOPS:
#ifdef IPV6_UNICAST_IF
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 30753cb93ab..284e8f55bc4 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -214,6 +214,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(269)
#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS WINE_AFD_IOC(270)
#define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF WINE_AFD_IOC(271)
+#define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF WINE_AFD_IOC(272)
struct afd_create_params
{
More information about the wine-cvs
mailing list