From bbfe3507499aba02adabc19fa4929b6053876887 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 9 Jul 2021 19:40:39 -0500 Subject: [PATCH] ws2_32: Move the getsockopt(IP_PKTINFO) implementation to ntdll. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard --- dlls/ntdll/unix/socket.c | 8 ++++++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index a3e0cb339e6..f862aa3e21b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1770,6 +1770,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_OPTIONS: return do_setsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, in_buffer, in_size ); +#ifdef IP_PKTINFO + case IOCTL_AFD_WINE_GET_IP_PKTINFO: + return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); +#elif defined(IP_RECVDSTADDR) + case IOCTL_AFD_WINE_GET_IP_PKTINFO: + return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9aaef3e595f..1cd1934a11e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2451,9 +2451,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, 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 + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_PKTINFO, optval, optlen ); + case WS_IP_TOS: case WS_IP_TTL: #ifdef IP_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 37969f5fbf6..3522e2444f5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -198,6 +198,7 @@ struct afd_get_events_params #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) +#define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) struct afd_create_params {