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

Alexandre Julliard julliard at winehq.org
Fri Jul 30 14:21:08 CDT 2021


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

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Fri Jul 30 00:00:42 2021 -0500

ws2_32: Move the getsockopt(IPV6_UNICAST_HOPS) 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 e9239bd7bb9..0a0ba7e2a98 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1882,6 +1882,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP:
             return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, in_buffer, in_size );
 
+        case IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS:
+            return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_HOPS, out_buffer, out_size );
+
         default:
         {
             if ((code >> 16) == FILE_DEVICE_NETWORK)
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 1f8020b5c3e..87f864d3c2b 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2422,6 +2422,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen );
 
         case WS_IPV6_UNICAST_HOPS:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen );
+
         case WS_IPV6_V6ONLY:
 #ifdef IPV6_UNICAST_IF
         case WS_IPV6_UNICAST_IF:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 6c84b72c028..9427ce46535 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -217,6 +217,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF            WINE_AFD_IOC(272)
 #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)
 
 struct afd_create_params
 {




More information about the wine-cvs mailing list