[PATCH 5/5] ws2_32: Move the getsockopt(IP_TTL) implementation to ntdll.

Zebediah Figura zfigura at codeweavers.com
Fri Jul 9 19:40:43 CDT 2021


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 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 559afb71eb8..c38f4f53089 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1790,6 +1790,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
         case IOCTL_AFD_WINE_SET_IP_TOS:
             return do_setsockopt( handle, io, IPPROTO_IP, IP_TOS, in_buffer, in_size );
 
+        case IOCTL_AFD_WINE_GET_IP_TTL:
+            return do_getsockopt( handle, io, IPPROTO_IP, IP_TTL, 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 d29931f2a76..fac19355705 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2458,6 +2458,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
             return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TOS, optval, optlen );
 
         case WS_IP_TTL:
+            return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen );
+
 #ifdef IP_UNICAST_IF
         case WS_IP_UNICAST_IF:
 #endif
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 26276d9c909..9e1802d5833 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -202,6 +202,7 @@ struct afd_get_events_params
 #define IOCTL_AFD_WINE_SET_IP_PKTINFO                   WINE_AFD_IOC(257)
 #define IOCTL_AFD_WINE_GET_IP_TOS                       WINE_AFD_IOC(258)
 #define IOCTL_AFD_WINE_SET_IP_TOS                       WINE_AFD_IOC(259)
+#define IOCTL_AFD_WINE_GET_IP_TTL                       WINE_AFD_IOC(260)
 
 struct afd_create_params
 {
-- 
2.30.2




More information about the wine-devel mailing list