Zebediah Figura : ws2_32: Move the setsockopt(IP_TTL) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Tue Jul 27 15:51:00 CDT 2021
Module: wine
Branch: master
Commit: bcf777fd18ac0077bb60d51d7e623dfdbd4bac36
URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcf777fd18ac0077bb60d51d7e623dfdbd4bac36
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jul 27 00:13:32 2021 -0500
ws2_32: Move the setsockopt(IP_TTL) 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 | 4 +++-
include/wine/afd.h | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c
index 3ea722a48ec..9b7e0d47040 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1784,6 +1784,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_IP_TTL:
return do_getsockopt( handle, io, IPPROTO_IP, IP_TTL, out_buffer, out_size );
+ case IOCTL_AFD_WINE_SET_IP_TTL:
+ return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, 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 7fb48698d2a..c86ddee7932 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3711,6 +3711,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_TOS:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TOS, optval, optlen );
+ case WS_IP_TTL:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TTL, optval, optlen );
+
case WS_IP_UNBLOCK_SOURCE:
{
WS_IP_MREQ_SOURCE* val = (void*)optval;
@@ -3724,7 +3727,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
convert_sockopt(&level, &optname);
break;
}
- case WS_IP_TTL:
#ifdef IP_UNICAST_IF
case WS_IP_UNICAST_IF:
#endif
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 9e1802d5833..f0b1e8d6e5f 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -203,6 +203,7 @@ struct afd_get_events_params
#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)
+#define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261)
struct afd_create_params
{
More information about the wine-cvs
mailing list