Zebediah Figura : ws2_32: Move the getsockopt(IP_OPTIONS) implementation to ntdll.
Alexandre Julliard
julliard at winehq.org
Fri Jul 9 16:45:33 CDT 2021
Module: wine
Branch: master
Commit: eafb3f6108abbbd54730a9bd1f05079fe830e4e8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=eafb3f6108abbbd54730a9bd1f05079fe830e4e8
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Jul 8 21:24:48 2021 -0500
ws2_32: Move the getsockopt(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 | 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 cb41dde28c0..b3d0c1575e6 100644
--- a/dlls/ntdll/unix/socket.c
+++ b/dlls/ntdll/unix/socket.c
@@ -1764,6 +1764,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc
case IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL:
return do_setsockopt( handle, io, IPPROTO_IP, IP_MULTICAST_TTL, in_buffer, in_size );
+ case IOCTL_AFD_WINE_GET_IP_OPTIONS:
+ return do_getsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, 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 d039833ec36..03dc47abc24 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -2449,6 +2449,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_MULTICAST_TTL, optval, optlen );
case WS_IP_OPTIONS:
+ return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_OPTIONS, optval, optlen );
+
#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 6286ef5ca29..20815f4012d 100644
--- a/include/wine/afd.h
+++ b/include/wine/afd.h
@@ -196,6 +196,7 @@ struct afd_get_events_params
#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)
+#define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254)
struct afd_create_params
{
More information about the wine-cvs
mailing list