[PATCH 1/4] ws2_32: Move the setsockopt(IP_TTL) implementation to ntdll.
From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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 3ea722a48ec..9b7e0d47040 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1784,6 +1784,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IP_TTL: return do_getsockopt( handle, io, IPPROTO_IP, IP_TTL, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IP_TTL: + return do_setsockopt( handle, io, IPPROTO_IP, IP_TTL, 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 7fb48698d2a..c86ddee7932 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3711,6 +3711,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_TOS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TOS, optval, optlen ); + case WS_IP_TTL: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TTL, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3724,7 +3727,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_TTL: #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index 9e1802d5833..f0b1e8d6e5f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -203,6 +203,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_TOS WINE_AFD_IOC(258) #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) struct afd_create_params { -- 2.30.2
From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- 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; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE, optval, optlen ); - optval = (char*)&mreq_source; - optlen = sizeof(mreq_source); - - 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 { -- 2.30.2
From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 9 +++++++++ dlls/ws2_32/socket.c | 13 +------------ include/wine/afd.h | 1 + 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ffa6a20b0a1..0269c2b78ae 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -88,6 +88,10 @@ #define TCP_KEEPIDLE TCP_KEEPALIVE #endif +#if defined(linux) && !defined(IP_UNICAST_IF) +#define IP_UNICAST_IF 50 +#endif + WINE_DEFAULT_DEBUG_CHANNEL(winsock); #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) @@ -1790,6 +1794,11 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE: return do_setsockopt( handle, io, IPPROTO_IP, IP_UNBLOCK_SOURCE, in_buffer, in_size ); +#ifdef IP_UNICAST_IF + case IOCTL_AFD_WINE_GET_IP_UNICAST_IF: + return do_getsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, 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 6582f8e0f95..f94558520af 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2495,19 +2495,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IP_TTL: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen ); -#ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: -#endif - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - return ret; + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_UNICAST_IF, optval, optlen ); default: FIXME( "unrecognized IP option %u\n", optname ); diff --git a/include/wine/afd.h b/include/wine/afd.h index a117bd5d3c5..18e53706fee 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -205,6 +205,7 @@ struct afd_get_events_params #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) +#define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) struct afd_create_params { -- 2.30.2
From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 5 +---- include/wine/afd.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0269c2b78ae..f33fc014f3b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1797,6 +1797,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_UNICAST_IF case IOCTL_AFD_WINE_GET_IP_UNICAST_IF: return do_getsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_UNICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f94558520af..d5de709e991 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3705,11 +3705,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_UNBLOCK_SOURCE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE, optval, optlen ); -#ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: -#endif - convert_sockopt(&level, &optname); - break; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNICAST_IF, optval, optlen ); default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); diff --git a/include/wine/afd.h b/include/wine/afd.h index 18e53706fee..c150e2ce474 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -206,6 +206,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261) #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) +#define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) struct afd_create_params { -- 2.30.2
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=94570 Your paranoid android. === debiant2 (32 bit report) === ws2_32: afd.c:336: Test failed: got flags 0x43 afd.c:342: Test failed: got flags 0x41
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=94567 Your paranoid android. === debiant2 (32 bit report) === ws2_32: afd.c:336: Test failed: got flags 0x43 afd.c:342: Test failed: got flags 0x41
participants (2)
-
Marvin -
Zebediah Figura