Zebediah Figura : ws2_32: Move the setsockopt(IP_MULTICAST_TTL) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Fri Jul 9 16:45:33 CDT 2021
Module: wine
Branch: master
Commit: ffb732bb31052f722ba314b715afd28b23723084
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb732bb31052f722ba314b715afd28b23723084
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jul 8 21:24:47 2021 -0500
ws2_32: Move the setsockopt(IP_MULTICAST_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 19cbd78028e..cb41dde28c0 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1761,6 +1761,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL:
return do_getsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_TTL, out_buffer, out_size );
+ case IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL:
+ return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_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 688634c7951..d039833ec36 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3658,6 +3658,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_MULTICAST_LOOP:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen );
+ case WS_IP_MULTICAST_TTL:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL, optval, optlen );
+
case WS_IP_UNBLOCK_SOURCE:
{
WS_IP_MREQ_SOURCE* val = (void*)optval;
@@ -3671,7 +3674,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
convert_sockopt(&level, &optname);
break;
}
- case WS_IP_MULTICAST_TTL:
case WS_IP_OPTIONS:
#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
case WS_IP_PKTINFO:
diff --git a/include/wine/afd.h b/include/wine/afd.h
index d650b13e297..6286ef5ca29 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -195,6 +195,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IP_MULTICAST_LOOP WINE_AFD_IOC(250)
#define IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP WINE_AFD_IOC(251)
#define IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL WINE_AFD_IOC(252)
+#define IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL WINE_AFD_IOC(253)
struct afd_create_params
{
More information about the wine-cvs
mailing list