Module: wine Branch: master Commit: 9715bd258c851ba464af42dd38804d3606342a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9715bd258c851ba464af42dd3...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jul 27 00:13:33 2021 -0500
ws2_32: Move the setsockopt(IP_UNBLOCK_SOURCE) 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 | 13 +------------ include/wine/afd.h | 1 + 3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 9b7e0d47040..ffa6a20b0a1 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1787,6 +1787,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_TTL: return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, in_buffer, in_size );
+ case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE: + return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, 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 c86ddee7932..6582f8e0f95 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3504,7 +3504,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { int fd; int woptval; - struct ip_mreq_source mreq_source;
TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, debugstr_sockopt(level, optname), debugstr_optval(optval, optlen), @@ -3715,18 +3714,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TTL, optval, optlen );
case WS_IP_UNBLOCK_SOURCE: - { - WS_IP_MREQ_SOURCE* val = (void*)optval; - mreq_source.imr_interface.s_addr = val->imr_interface.S_un.S_addr; - mreq_source.imr_multiaddr.s_addr = val->imr_multiaddr.S_un.S_addr; - mreq_source.imr_sourceaddr.s_addr = val->imr_sourceaddr.S_un.S_addr; - - optval = (char*)&mreq_source; - optlen = sizeof(mreq_source); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE, optval, optlen );
- convert_sockopt(&level, &optname); - break; - } #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index f0b1e8d6e5f..a117bd5d3c5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -204,6 +204,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_TOS WINE_AFD_IOC(259) #define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260) #define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261) +#define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262)
struct afd_create_params {