Zebediah Figura : ws2_32: Move the setsockopt(IPV6_ADD_MEMBERSHIP) implementation to ntdll.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef54a8c318a26d08f593bbe5cfdd9c41b3318031
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ef54a8c318a26d08f593bbe5c...

Author: Zebediah Figura 
Date:   Wed Jul 28 10:17:05 2021 -0500

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

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/ntdll/unix/socket.c | 5 +++++
 dlls/ws2_32/socket.c     | 4 ++--
 include/wine/afd.h       | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index f33fc014f3b..f0dc00a9651 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1802,6 +1802,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
             return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size );
 #endif

+#ifdef IPV6_ADD_MEMBERSHIP
+        case IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP:
+            return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, in_buffer, in_size );
+#endif
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index d5de709e991..f02d668ece4 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3717,9 +3717,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
     case WS_IPPROTO_IPV6:
         switch(optname)
         {
-#ifdef IPV6_ADD_MEMBERSHIP
         case WS_IPV6_ADD_MEMBERSHIP:
-#endif
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP, optval, optlen );
+
 #ifdef IPV6_DROP_MEMBERSHIP
         case WS_IPV6_DROP_MEMBERSHIP:
 #endif
diff --git a/include/wine/afd.h b/include/wine/afd.h
index c150e2ce474..dda07695f75 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -207,6 +207,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE            WINE_AFD_IOC(262)
 #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF                WINE_AFD_IOC(263)
 #define IOCTL_AFD_WINE_SET_IP_UNICAST_IF                WINE_AFD_IOC(264)
+#define IOCTL_AFD_WINE_SET_IPV6_ADD_MEMBERSHIP          WINE_AFD_IOC(265)

struct afd_create_params
 {