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

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Fri Jul 30 00:00:43 2021 -0500

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

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

---

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

diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 0a0ba7e2a98..efbfc375969 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1885,6 +1885,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS:
             return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size );

+        case IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS:
+            return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, 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 87f864d3c2b..3ca2ce545b4 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3642,7 +3642,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IPV6_MULTICAST_LOOP:
             return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen );

-        case WS_IPV6_UNICAST_HOPS:
 #ifdef IPV6_UNICAST_IF
         case WS_IPV6_UNICAST_IF:
 #endif
@@ -3651,6 +3650,10 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IPV6_PROTECTION_LEVEL:
             FIXME("IPV6_PROTECTION_LEVEL is ignored!\n");
             return 0;
+
+        case WS_IPV6_UNICAST_HOPS:
+            return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen );
+
         case WS_IPV6_V6ONLY:
         {
             union generic_unix_sockaddr uaddr;
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 9427ce46535..64d555889f5 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -218,6 +218,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP          WINE_AFD_IOC(273)
 #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP          WINE_AFD_IOC(274)
 #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS            WINE_AFD_IOC(275)
+#define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS            WINE_AFD_IOC(276)

struct afd_create_params
 {