November 2022 - Wine-commits

Paul Gofman : ws2_32: Track SO_EXCLUSIVEADDRUSE option value.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: d656cb2024a5018cce53a40540a0a6d4e566c38e URL: https://gitlab.winehq.org/wine/wine/-/commit/d656cb2024a5018cce53a40540a0a6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:46:08 2022 -0600 ws2_32: Track SO_EXCLUSIVEADDRUSE option value. --- dlls/ws2_32/socket.c | 20 ++++++++++++++------ dlls/ws2_32/tests/sock.c | 1 + include/wine/afd.h | 2 ++ server/sock.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2f115f02e48..9e447f29d8c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1818,6 +1818,11 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; return ret; + case SO_EXCLUSIVEADDRUSE: + ret = server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE, optval, optlen ); + if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; + return ret; + case SO_SNDBUF: if (*optlen < sizeof(DWORD) || !optval) { @@ -3215,6 +3220,15 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int memcpy( &value, optval, min( optlen, sizeof(value) )); return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_REUSEADDR, (char *)&value, sizeof(value) ); + case SO_EXCLUSIVEADDRUSE: + if (!optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE, (char *)&value, sizeof(value) ); + case SO_SNDBUF: if (optlen < 0) optlen = 4; return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); @@ -3240,12 +3254,6 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int SetLastError( ERROR_SUCCESS ); return 0; - /* Stops two sockets from being bound to the same port. Always happens - * on unix systems, so just drop it. */ - case SO_EXCLUSIVEADDRUSE: - TRACE("Ignoring SO_EXCLUSIVEADDRUSE, is always set.\n"); - return 0; - /* After a ConnectEx call succeeds, the socket can't be used with half of the * normal winsock functions on windows. We don't have that problem. */ case SO_UPDATE_CONNECT_CONTEXT: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 852cdd88dc7..00f4327bb3b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1209,6 +1209,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDBUF, FALSE, {1, 2, 4}, {0xdeadbe00, 0xdead0000}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_OPENTYPE, FALSE, {1, 2, 4}, {0}, TRUE}, diff --git a/include/wine/afd.h b/include/wine/afd.h index 993730cacdb..b34a7b7318e 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -283,6 +283,8 @@ C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(297) +#define IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE WINE_AFD_IOC(298) struct afd_iovec { diff --git a/server/sock.c b/server/sock.c index 2156a1a12c2..88215650757 100644 --- a/server/sock.c +++ b/server/sock.c @@ -256,6 +256,7 @@ struct sock unsigned int bound : 1; /* is the socket bound? */ unsigned int reset : 1; /* did we get a TCP reset? */ unsigned int reuseaddr : 1; /* winsock SO_REUSEADDR option value */ + unsigned int exclusiveaddruse : 1; /* winsock SO_EXCLUSIVEADDRUSE option value */ }; static int is_tcp_socket( struct sock *sock ) @@ -1697,6 +1698,7 @@ static struct sock *create_socket(void) sock->bound = 0; sock->reset = 0; sock->reuseaddr = 0; + sock->exclusiveaddruse = 0; sock->rcvbuf = 0; sock->sndbuf = 0; sock->rcvtimeo = 0; @@ -3103,6 +3105,21 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + case IOCTL_AFD_WINE_SET_SO_EXCLUSIVEADDRUSE: + { + int exclusive; + + if (get_req_data_size() < sizeof(exclusive)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + exclusive = *(int *)get_req_data(); + sock->exclusiveaddruse = !!exclusive; + return; + } + case IOCTL_AFD_WINE_GET_SO_SNDBUF: { int sndbuf = sock->sndbuf; @@ -3205,6 +3222,21 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + case IOCTL_AFD_WINE_GET_SO_EXCLUSIVEADDRUSE: + { + int exclusive; + + if (!get_reply_max_size()) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + exclusive = sock->exclusiveaddruse; + set_reply_data( &exclusive, min( sizeof(exclusive), get_reply_max_size() )); + return; + } + case IOCTL_AFD_POLL: { if (get_reply_max_size() < get_req_data_size())

1 0

Paul Gofman : server: Make SO_REUSEADDR and SO_EXCLUSIVEADDRUSE mutually exclusive.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 12b604926e6c5a87cac6e4375f0718ecb665ecfe URL: https://gitlab.winehq.org/wine/wine/-/commit/12b604926e6c5a87cac6e4375f0718… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:50:58 2022 -0600 server: Make SO_REUSEADDR and SO_EXCLUSIVEADDRUSE mutually exclusive. --- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00f4327bb3b..44a1691950a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2353,7 +2353,7 @@ static void test_reuseaddr(void) value = 1; rc = setsockopt(s1, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char*)&value, sizeof(value)); - todo_wine ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); + ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); value = 0; rc = setsockopt(s1, SOL_SOCKET, SO_REUSEADDR, (char*)&value, sizeof(value)); @@ -2364,7 +2364,7 @@ static void test_reuseaddr(void) value = 1; rc = setsockopt(s1, SOL_SOCKET, SO_REUSEADDR, (char*)&value, sizeof(value)); - todo_wine ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); + ok(rc == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "got rc %d, error %d.\n", rc, WSAGetLastError()); closesocket(s1); diff --git a/server/sock.c b/server/sock.c index 88215650757..141c5ea6d0a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3091,6 +3091,13 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } reuse = *(int *)get_req_data(); + + if (reuse && sock->exclusiveaddruse) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (is_tcp_socket( sock )) ret = 0; else @@ -3116,6 +3123,11 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } exclusive = *(int *)get_req_data(); + if (exclusive && sock->reuseaddr) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } sock->exclusiveaddruse = !!exclusive; return; }

1 0

Paul Gofman : server: Use struct bound_addr as a key to bound_addresses_tree.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 9163d3420f40155927ecd6c913c5ffb2109f580c URL: https://gitlab.winehq.org/wine/wine/-/commit/9163d3420f40155927ecd6c913c5ff… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 14:59:55 2022 -0600 server: Use struct bound_addr as a key to bound_addresses_tree. --- server/sock.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/server/sock.c b/server/sock.c index 141c5ea6d0a..5ed62ae700f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -267,24 +267,24 @@ static int is_tcp_socket( struct sock *sock ) static int addr_compare( const void *key, const struct wine_rb_entry *entry ) { const struct bound_addr *bound_addr = RB_ENTRY_VALUE(entry, struct bound_addr, entry); - const union unix_sockaddr *addr = key; + const struct bound_addr *addr = key; - if (addr->addr.sa_family != bound_addr->addr.addr.sa_family) - return addr->addr.sa_family < bound_addr->addr.addr.sa_family ? -1 : 1; + if (addr->addr.addr.sa_family != bound_addr->addr.addr.sa_family) + return addr->addr.addr.sa_family < bound_addr->addr.addr.sa_family ? -1 : 1; - if (addr->addr.sa_family == AF_INET) + if (addr->addr.addr.sa_family == AF_INET) { - if (addr->in.sin_port != bound_addr->addr.in.sin_port) - return addr->in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; - if (addr->in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) + if (addr->addr.in.sin_port != bound_addr->addr.in.sin_port) + return addr->addr.in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; + if (addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) return 0; - return addr->in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; + return addr->addr.in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; } - assert( addr->addr.sa_family == AF_INET6 ); - if (addr->in6.sin6_port != bound_addr->addr.in6.sin6_port) - return addr->in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; - return memcmp( &addr->in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->in6.sin6_addr) ); + assert( addr->addr.addr.sa_family == AF_INET6 ); + if (addr->addr.in6.sin6_port != bound_addr->addr.in6.sin6_port) + return addr->addr.in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; + return memcmp( &addr->addr.in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->addr.in6.sin6_addr) ); } static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6 ) @@ -325,21 +325,23 @@ static int should_track_conflicts_for_addr( struct sock *sock, const union unix_ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, int v6only ) { - struct bound_addr *bound_addr; - union unix_sockaddr v4addr; + struct bound_addr *bound_addr, search_addr; struct rb_entry *entry; if (!should_track_conflicts_for_addr( sock, addr )) return 0; - if ((entry = rb_get( &bound_addresses_tree, addr ))) + search_addr.addr = *addr; + + if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; } if (sock->family != WS_AF_INET6 || v6only) return 0; - if (!ipv4addr_from_v6( &v4addr, &addr->in6 )) return 0; - if ((entry = rb_get( &bound_addresses_tree, &v4addr ))) + if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6 )) return 0; + + if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; @@ -349,15 +351,18 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, static struct bound_addr *register_bound_address( struct sock *sock, const union unix_sockaddr *addr ) { - struct bound_addr *bound_addr; + struct bound_addr *bound_addr, *temp; if (!(bound_addr = mem_alloc( sizeof(*bound_addr) ))) return NULL; - if (rb_put( &bound_addresses_tree, addr, &bound_addr->entry )) + bound_addr->addr = *addr; + + if (rb_put( &bound_addresses_tree, bound_addr, &bound_addr->entry )) { - free( bound_addr ); - bound_addr = WINE_RB_ENTRY_VALUE(rb_get( &bound_addresses_tree, addr ), struct bound_addr, entry); + temp = bound_addr; + bound_addr = WINE_RB_ENTRY_VALUE(rb_get( &bound_addresses_tree, temp ), struct bound_addr, entry); + free( temp ); if (bound_addr->reuse_count == -1) { if (debug_level) @@ -368,7 +373,6 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union } else { - bound_addr->addr = *addr; bound_addr->reuse_count = sock->reuseaddr ? 1 : -1; } return bound_addr;

1 0

Paul Gofman : server: Set error in check_addr_usage().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 6992f2cba58982f8453c307e3cfcf65b767e82da URL: https://gitlab.winehq.org/wine/wine/-/commit/6992f2cba58982f8453c307e3cfcf6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 15:06:47 2022 -0600 server: Set error in check_addr_usage(). --- server/sock.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index 5ed62ae700f..3bb04c5925a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -335,7 +335,11 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); - if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; + if (bound_addr->reuse_count == -1 || !sock->reuseaddr) + { + set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + return 1; + } } if (sock->family != WS_AF_INET6 || v6only) return 0; @@ -344,7 +348,11 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); - if (bound_addr->reuse_count == -1 || !sock->reuseaddr) return 1; + if (bound_addr->reuse_count == -1 || !sock->reuseaddr) + { + set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + return 1; + } } return 0; } @@ -2895,10 +2903,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif if (check_addr_usage( sock, &bind_addr, v6only )) - { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return; - } if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0

Paul Gofman : server: Use htonl() with INADDR_ANY in ipv4addr_from_v6().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0328ba93f3e87cc90232fea1176f6a4fe96d404f URL: https://gitlab.winehq.org/wine/wine/-/commit/0328ba93f3e87cc90232fea1176f6a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 16:57:59 2022 -0600 server: Use htonl() with INADDR_ANY in ipv4addr_from_v6(). --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 3bb04c5925a..e9e4640b3b8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -293,7 +293,7 @@ static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_ v4addr->in.sin_port = in6->sin6_port; if (IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) { - v4addr->in.sin_addr.s_addr = INADDR_ANY; + v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; } if (IN6_IS_ADDR_LOOPBACK(&in6->sin6_addr))

1 0

Paul Gofman : server: Do not translate loopback addr in ipv4addr_from_v6().
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 003ee6202bddc808d1de4f75ab99454e92884809 URL: https://gitlab.winehq.org/wine/wine/-/commit/003ee6202bddc808d1de4f75ab9945… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 15:40:55 2022 -0600 server: Do not translate loopback addr in ipv4addr_from_v6(). --- server/sock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index e9e4640b3b8..d1c63dc47c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -296,11 +296,6 @@ static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_ v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; } - if (IN6_IS_ADDR_LOOPBACK(&in6->sin6_addr)) - { - v4addr->in.sin_addr.s_addr = INADDR_LOOPBACK; - return 1; - } if (IN6_IS_ADDR_V4COMPAT(&in6->sin6_addr) || IN6_IS_ADDR_V4MAPPED(&in6->sin6_addr)) { memcpy( &v4addr->in.sin_addr.s_addr, &in6->sin6_addr.s6_addr[12], sizeof(v4addr->in.sin_addr.s_addr) );

1 0

Paul Gofman : server: Support SO_EXCLUSIVEADDRUSE socket option.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: a9ae1e041c078fda48a5a0de7c7ccf95dd90a73a URL: https://gitlab.winehq.org/wine/wine/-/commit/a9ae1e041c078fda48a5a0de7c7ccf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:20:10 2022 -0600 server: Support SO_EXCLUSIVEADDRUSE socket option. --- dlls/ws2_32/tests/sock.c | 22 +++++++++------------- server/sock.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 44a1691950a..9b39ecff3c5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2043,19 +2043,18 @@ static void test_reuseaddr(void) } s[2]; int error; - BOOL todo; } tests_exclusive[] = { { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2065,7 +2064,7 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }, @@ -2075,12 +2074,12 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback, sizeof(saddr_in6_loopback), FALSE, }, @@ -2095,17 +2094,17 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback_v4mapped, sizeof(saddr_in6_loopback_v4mapped), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2120,7 +2119,7 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any_v4mapped, sizeof(saddr_in6_any_v4mapped), FALSE, }, @@ -2398,14 +2397,11 @@ static void test_reuseaddr(void) rc = bind(s[1], tests_exclusive[i].s[1].addr, tests_exclusive[i].s[1].addrlen); - todo_wine_if(tests_exclusive[i].todo) - { if (tests_exclusive[i].error) ok(rc == SOCKET_ERROR && WSAGetLastError() == tests_exclusive[i].error, "got rc %d, error %d, expected error %d.\n", rc, WSAGetLastError(), tests_exclusive[i].error); else ok(!rc, "got error %d.\n", WSAGetLastError()); - } closesocket(s[0]); closesocket(s[1]); diff --git a/server/sock.c b/server/sock.c index d1c63dc47c3..c130821b7f4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -187,6 +187,7 @@ struct bound_addr { struct rb_entry entry; union unix_sockaddr addr; + int match_any_addr; int reuse_count; }; @@ -276,7 +277,8 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) { if (addr->addr.in.sin_port != bound_addr->addr.in.sin_port) return addr->addr.in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; - if (addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) + if (bound_addr->match_any_addr || addr->match_any_addr + || addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) return 0; return addr->addr.in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; } @@ -284,14 +286,16 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) assert( addr->addr.addr.sa_family == AF_INET6 ); if (addr->addr.in6.sin6_port != bound_addr->addr.in6.sin6_port) return addr->addr.in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; + if (bound_addr->match_any_addr || addr->match_any_addr) return 0; return memcmp( &addr->addr.in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->addr.in6.sin6_addr) ); } -static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6 ) +static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6, int map_unspecified ) { v4addr->in.sin_family = AF_INET; v4addr->in.sin_port = in6->sin6_port; - if (IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) + + if (map_unspecified && IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) { v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; @@ -318,6 +322,15 @@ static int should_track_conflicts_for_addr( struct sock *sock, const union unix_ return 0; } +static int is_any_addr( const union unix_sockaddr *addr ) +{ + if (addr->addr.sa_family == AF_INET && addr->in.sin_addr.s_addr == htonl( INADDR_ANY )) + return 1; + if (addr->addr.sa_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&addr->in6.sin6_addr)) + return 1; + return 0; +} + static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, int v6only ) { struct bound_addr *bound_addr, search_addr; @@ -326,26 +339,30 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if (!should_track_conflicts_for_addr( sock, addr )) return 0; search_addr.addr = *addr; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } if (sock->family != WS_AF_INET6 || v6only) return 0; - if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6 )) return 0; + if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6, sock->exclusiveaddruse )) return 0; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( &search_addr.addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } @@ -360,6 +377,7 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union return NULL; bound_addr->addr = *addr; + bound_addr->match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if (rb_put( &bound_addresses_tree, bound_addr, &bound_addr->entry )) { @@ -392,7 +410,8 @@ static void update_addr_usage( struct sock *sock, const union unix_sockaddr *add sock->bound_addr[0] = register_bound_address( sock, addr ); if (sock->family != WS_AF_INET6 || v6only) return; - if (!ipv4addr_from_v6( &v4addr, &addr->in6 )) return; + + if (!ipv4addr_from_v6( &v4addr, &addr->in6, sock->exclusiveaddruse )) return; sock->bound_addr[1] = register_bound_address( sock, &v4addr ); }

1 0

Paul Gofman : http.sys: Use SO_EXCLUSIVEADDRUSE on listening socket.
by Alexandre Julliard 04 Nov '22

04 Nov '22

Module: wine Branch: master Commit: 0ba9567a5651418b2f373643e70895fc2de6d9fc URL: https://gitlab.winehq.org/wine/wine/-/commit/0ba9567a5651418b2f373643e70895… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 15:58:23 2022 -0600 http.sys: Use SO_EXCLUSIVEADDRUSE on listening socket. --- dlls/http.sys/http.c | 4 +++- dlls/httpapi/tests/httpapi.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index e16805ccbdb..680ef30730c 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -715,7 +715,7 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) struct listening_socket *listening_sock; char *url, *endptr; size_t queue_url_len, new_url_len; - ULONG true = 1; + ULONG true = 1, value; SOCKET s = INVALID_SOCKET; TRACE("host %s, context %s.\n", debugstr_a(params->url), wine_dbgstr_longlong(params->context)); @@ -781,6 +781,8 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_family = AF_INET; addr.sin_addr.S_un.S_addr = INADDR_ANY; + value = 1; + setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&value, sizeof(value)); if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { LeaveCriticalSection(&http_cs); diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ec1be5bc82a..1d00aa22c50 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -1397,7 +1397,7 @@ static void test_v2_bound_port(void) ok(!ret, "Failed to bind to port\n"); swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0); - todo_wine ok(ret == ERROR_SHARING_VIOLATION, "Unexpected failure adding %s, error %u.\n", debugstr_w(url), ret); + ok(ret == ERROR_SHARING_VIOLATION, "Unexpected failure adding %s, error %u.\n", debugstr_w(url), ret); shutdown(s2, SD_BOTH); closesocket(s2); @@ -1407,8 +1407,8 @@ static void test_v2_bound_port(void) s = socket(AF_INET, SOCK_STREAM, 0); ret = connect(s, (struct sockaddr *)&sockaddr, sizeof(sockaddr)); - todo_wine ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); - todo_wine ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); + ok(ret, "Connecting to socket succeeded, %lu.\n", GetLastError()); + ok(GetLastError() == WSAECONNREFUSED, "Unexpected error connecting to socket, %lu.\n", GetLastError()); closesocket(s); ret = pHttpCloseRequestQueue(dummy_queue);

1 0

Jacek Caban : winevulkan: Don't check thunk_type in VkParam.needs_unwrapping.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: 67c9ff6f2e28b50d85fdd3bd8397341b719fb506 URL: https://gitlab.winehq.org/wine/wine/-/commit/67c9ff6f2e28b50d85fdd3bd839734… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 27 20:09:43 2022 +0200 winevulkan: Don't check thunk_type in VkParam.needs_unwrapping. --- dlls/winevulkan/make_vulkan | 3 --- dlls/winevulkan/vulkan_thunks.c | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6d5ead98833..1db4498abd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1728,9 +1728,6 @@ class VkParam(VkVariable): def needs_unwrapping(self): """ Returns if parameter needs unwrapping of handle. """ - if self.func.needs_private_thunk(): - return False - # Wrapped handle parameters are handled separately, only look for wrapped handles in structs if self.is_struct(): return self.struct.needs_unwrapping() diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 65b4ab9b496..c4e42f3ce71 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2158,13 +2158,13 @@ static inline void convert_VkPhysicalDeviceProperties2_host_to_win32(const VkPhy #endif /* USE_STRUCT_CONVERSION */ #if defined(USE_STRUCT_CONVERSION) -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) +static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) { if (!in) return; out->sType = in->sType; out->pNext = in->pNext; - out->surface = wine_surface_from_handle(in->surface)->driver_surface; + out->surface = in->surface; } #endif /* USE_STRUCT_CONVERSION */ @@ -2179,6 +2179,17 @@ static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_host(const V } #endif /* USE_STRUCT_CONVERSION */ +#if defined(USE_STRUCT_CONVERSION) +static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR_host *out) +{ + if (!in) return; + + out->sType = in->sType; + out->pNext = in->pNext; + out->surface = wine_surface_from_handle(in->surface)->driver_surface; +} +#endif /* USE_STRUCT_CONVERSION */ + #if defined(USE_STRUCT_CONVERSION) static inline void convert_VkPipelineExecutableInfoKHR_win32_to_host(const VkPipelineExecutableInfoKHR *in, VkPipelineExecutableInfoKHR_host *out) { @@ -17227,7 +17238,7 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilities2KHR(void *args) TRACE("%p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceCapabilities); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_host(params->pSurfaceInfo, &pSurfaceInfo_host); + convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(params->pSurfaceInfo, &pSurfaceInfo_host); params->result = wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(params->physicalDevice, &pSurfaceInfo_host, params->pSurfaceCapabilities); return STATUS_SUCCESS; }

1 0

Jacek Caban : winevulkan: Don't store conversion functions in VkParam.
by Alexandre Julliard 03 Nov '22

03 Nov '22

Module: wine Branch: master Commit: be28be1de7d57ef4e50d2d11730ac31d06bf5660 URL: https://gitlab.winehq.org/wine/wine/-/commit/be28be1de7d57ef4e50d2d11730ac3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 19:38:41 2022 +0200 winevulkan: Don't store conversion functions in VkParam. --- dlls/winevulkan/make_vulkan | 82 ++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1db4498abd9..2a369f5b3c4 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -587,10 +587,7 @@ class VkFunction(object): vk_param = VkParam.from_xml(param, types) params.append(vk_param) - func = VkFunction(_type=func_type, name=func_name, params=params) - for param in params: - param.set_conversions(func) - return func + return VkFunction(_type=func_type, name=func_name, params=params) def get_conversions(self): """ Get a list of conversion functions required for this function if any. @@ -813,7 +810,7 @@ class VkFunction(object): # Call any win_to_host conversion calls. unwrap = self.thunk_type == ThunkType.PUBLIC for p in self.params: - if p.needs_input_conversion(conv) and (conv or (unwrap and p.needs_unwrapping())): + if p.needs_input_conversion(conv, unwrap): body += p.copy(Direction.INPUT, conv, unwrap, prefix=params_prefix) # Build list of parameters containing converted and non-converted parameters. @@ -834,11 +831,8 @@ class VkFunction(object): body += " {0}result = {1}{2}({3});\n".format(params_prefix, func_prefix, self.name, params) # Call any host_to_win conversion calls. - if conv: - for p in self.params: - if not p.needs_output_conversion(conv): - continue - + for p in self.params: + if p.needs_output_conversion(conv, unwrap): body += p.copy(Direction.OUTPUT, conv, unwrap, prefix=params_prefix) if needs_alloc: @@ -1483,33 +1477,6 @@ class VkParam(VkVariable): return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional) - def set_conversions(self, func): - """ Internal helper function to configure any needed conversion functions. """ - - self.func = func - self.input_conv = None - self.input_unwrap = None - self.output_conv = None - self.output_unwrap = None - - unwrap = func.thunk_type == ThunkType.PUBLIC; - - # Input functions require win to host conversion. - if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: - if unwrap and self.needs_unwrapping(): - self.input_unwrap = ConversionFunction(self, Direction.INPUT, False, True) - self.input_conv = ConversionFunction(self, Direction.INPUT, True, True) - elif self.needs_conversion(): - self.input_conv = ConversionFunction(self, Direction.INPUT, True, unwrap or not self.needs_unwrapping()) - - # Output functions require host to win conversion. - if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: - if unwrap and self.needs_unwrapping(): - self.output_conv = ConversionFunction(self, Direction.OUTPUT, False) - self.output_conv = ConversionFunction(self, Direction.OUTPUT, True) - elif self.needs_conversion(): - self.output_conv = ConversionFunction(self, Direction.OUTPUT, True, unwrap or not self.needs_unwrapping()) - def _set_direction(self): """ Internal helper function to set parameter direction (input/output/input_output). """ @@ -1688,14 +1655,23 @@ class VkParam(VkVariable): conversions.extend(m.get_conversions(func)) # Conversion requirements for the 'parent' parameter. - if self.input_unwrap is not None: - conversions.append(self.input_unwrap) - if self.input_conv is not None: - conversions.append(self.input_conv) - if self.output_unwrap is not None: - conversions.append(self.output_unwrap) - if self.output_conv is not None: - conversions.append(self.output_conv) + unwrap = func.thunk_type == ThunkType.PUBLIC; + + # Input functions require win to host conversion. + if self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: + if unwrap and self.needs_unwrapping(): + conversions.append(ConversionFunction(self, Direction.INPUT, False, True)) + conversions.append(ConversionFunction(self, Direction.INPUT, True, True)) + elif self.needs_conversion(): + conversions.append(ConversionFunction(self, Direction.INPUT, True, unwrap or not self.needs_unwrapping())) + + # Output functions require host to win conversion. + if self._direction in [Direction.INPUT_OUTPUT, Direction.OUTPUT]: + if unwrap and self.needs_unwrapping(): + conversions.append(ConversionFunction(self, Direction.OUTPUT, False)) + conversions.append(ConversionFunction(self, Direction.OUTPUT, True)) + elif self.needs_conversion(): + conversions.append(ConversionFunction(self, Direction.OUTPUT, True, unwrap or not self.needs_unwrapping())) return conversions @@ -1737,11 +1713,19 @@ class VkParam(VkVariable): return False - def needs_input_conversion(self, conv): - return (self.input_conv if conv else self.input_unwrap) is not None + def needs_input_conversion(self, conv, unwrap): + if not self._direction in [Direction.INPUT, Direction.INPUT_OUTPUT]: + return False + if unwrap and self.needs_unwrapping(): + return True + return conv and self.needs_conversion() - def needs_output_conversion(self, conv): - return (self.output_conv if conv else self.output_unwrap) is not None + def needs_output_conversion(self, conv, unwrap): + if not self._direction in [Direction.OUTPUT, Direction.INPUT_OUTPUT]: + return False + if unwrap and self.needs_unwrapping(): + return True + return conv and self.needs_conversion() def spec(self): """ Generate spec file entry for this parameter. """

1 0