Zebediah Figura : ws2_32: Move the setsockopt(IP_OPTIONS) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Fri Jul 9 16:45:33 CDT 2021
Module: wine
Branch: master
Commit: ecce6909d6b24134b3e7355fe0ab88b3efba2dcd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecce6909d6b24134b3e7355fe0ab88b3efba2dcd
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jul 8 21:24:49 2021 -0500
ws2_32: Move the setsockopt(IP_OPTIONS) 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 b3d0c1575e6..a3e0cb339e6 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1767,6 +1767,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_GET_IP_OPTIONS:
return do_getsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, out_buffer, out_size );
+ case IOCTL_AFD_WINE_SET_IP_OPTIONS:
+ return do_setsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, 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 03dc47abc24..9aaef3e595f 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -3663,6 +3663,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
case WS_IP_MULTICAST_TTL:
return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL, optval, optlen );
+ case WS_IP_OPTIONS:
+ return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_OPTIONS, optval, optlen );
+
case WS_IP_UNBLOCK_SOURCE:
{
WS_IP_MREQ_SOURCE* val = (void*)optval;
@@ -3676,7 +3679,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
convert_sockopt(&level, &optname);
break;
}
- case WS_IP_OPTIONS:
#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR)
case WS_IP_PKTINFO:
#endif
diff --git a/include/wine/afd.h b/include/wine/afd.h
index 20815f4012d..37969f5fbf6 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -197,6 +197,7 @@ struct afd_get_events_params
#define IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL WINE_AFD_IOC(252)
#define IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL WINE_AFD_IOC(253)
#define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254)
+#define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255)
struct afd_create_params
{
More information about the wine-cvs
mailing list