Module: wine Branch: master Commit: 81ba59bb21a27b16ab13019c0e0ca75e992003fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ba59bb21a27b16ab13019c0...
Author: Zebediah Figura zfigura@codeweavers.com Date: Fri Jul 30 00:00:45 2021 -0500
ws2_32: Move the setsockopt(IPV6_UNICAST_IF) implementation to ntdll.
Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 8 +++----- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 09318a279ed..27d7e1c06d2 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1891,6 +1891,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IPV6_UNICAST_IF case IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF: return do_getsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IPV6, IPV6_UNICAST_IF, in_buffer, in_size ); #endif
default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ca4f2c1831..769b6e5cea0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3642,11 +3642,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_MULTICAST_LOOP: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen );
-#ifdef IPV6_UNICAST_IF - case WS_IPV6_UNICAST_IF: -#endif - convert_sockopt(&level, &optname); - break; case WS_IPV6_PROTECTION_LEVEL: FIXME("IPV6_PROTECTION_LEVEL is ignored!\n"); return 0; @@ -3654,6 +3649,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IPV6_UNICAST_HOPS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen );
+ case WS_IPV6_UNICAST_IF: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); + case WS_IPV6_V6ONLY: { union generic_unix_sockaddr uaddr; diff --git a/include/wine/afd.h b/include/wine/afd.h index b43d53522a4..8aba4dd3c71 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -220,6 +220,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS WINE_AFD_IOC(275) #define IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS WINE_AFD_IOC(276) #define IOCTL_AFD_WINE_GET_IPV6_UNICAST_IF WINE_AFD_IOC(277) +#define IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF WINE_AFD_IOC(278)
struct afd_create_params {