Skip to content

Fix flaky tcp bind on Windows test runs #10387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 1 commit into from
May 5, 2026
+2 −75
Merged

Fix flaky tcp bind on Windows test runs #10387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions examples/ocsp_responder/ocsp_responder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,13 +943,6 @@ THREAD_RETURN WOLFSSL_THREAD ocsp_responder_test(void* args)
}
}

#ifdef USE_WINDOWS_API
if (opts.port == 0) {
/* Generate random port for testing */
opts.port = GetRandomPort();
}
#endif /* USE_WINDOWS_API */

/* Create and listen on server socket */
tcp_listen(&sockfd, &opts.port, 1, 0, 0);

Expand Down
7 changes: 0 additions & 7 deletions examples/server/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3231,13 +3231,6 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
}
#endif

#ifdef USE_WINDOWS_API
if (port == 0) {
/* Generate random port for testing */
port = GetRandomPort();
}
#endif /* USE_WINDOWS_API */

#ifdef WOLFSSL_ASYNC_CRYPT
ret = wolfAsync_DevOpen(&devId);
if (ret < 0) {
Expand Down
45 changes: 0 additions & 45 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6050,11 +6050,6 @@ void test_wolfSSL_client_server_nofail_ex(callback_functions* client_cb,
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

server_args.signal = &ready;
server_args.callbacks = server_cb;
client_args.signal = &ready;
Expand Down Expand Up @@ -6748,11 +6743,6 @@ static int test_wolfSSL_read_write(void)
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

server_args.signal = &ready;
client_args.signal = &ready;

Expand Down Expand Up @@ -6841,11 +6831,6 @@ static int test_wolfSSL_reuse_WOLFSSLobj(void)
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

client_cbf.method = wolfTLSv1_2_client_method;
server_cbf.method = wolfTLSv1_2_server_method;
client_args.callbacks = &client_cbf;
Expand Down Expand Up @@ -8119,11 +8104,6 @@ static int test_wolfSSL_dtls_export(void)

InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

/* set using dtls */
XMEMSET(&client_args, 0, sizeof(func_args));
XMEMSET(&server_args, 0, sizeof(func_args));
Expand Down Expand Up @@ -8194,11 +8174,6 @@ static int test_wolfSSL_dtls_export(void)

InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

/* set using dtls */
XMEMSET(&server_args, 0, sizeof(func_args));
XMEMSET(&server_cbf, 0, sizeof(callback_functions));
Expand Down Expand Up @@ -8675,11 +8650,6 @@ static int test_wolfSSL_tls_export_run(method_provider server_method,

InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

XMEMSET(&server_args, 0, sizeof(func_args));
XMEMSET(&server_cbf, 0, sizeof(callback_functions));
server_cbf.method = server_method;
Expand Down Expand Up @@ -8795,11 +8765,6 @@ static void test_wolfSSL_client_server(callback_functions* client_callbacks,
/* RUN Server side */
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

server_args.signal = &ready;
client_args.signal = &ready;
start_thread(run_wolfssl_server, &server_args, &serverThread);
Expand Down Expand Up @@ -18350,11 +18315,6 @@ static int test_wolfSSL_SESSION(void)
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

server_args.signal = &ready;
start_thread(test_server_nofail, &server_args, &serverThread);
wait_tcp_ready(&server_args);
Expand Down Expand Up @@ -26888,11 +26848,6 @@ static int test_wolfSSL_read_detect_TCP_disconnect(void)
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

XMEMSET(&client_args, 0, sizeof(func_args));
XMEMSET(&server_args, 0, sizeof(func_args));

Expand Down
12 changes: 0 additions & 12 deletions tests/api/test_ossl_bio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,6 @@ int test_wolfSSL_BIO_should_retry(void)
StartTCP();
InitTcpReady(&ready);

#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif

server_args.signal = &ready;
start_thread(test_server_nofail, &server_args, &serverThread);
Expand Down Expand Up @@ -465,10 +461,6 @@ int test_wolfSSL_BIO_connect(void)
XMEMSET(&server_args, 0, sizeof(func_args));
StartTCP();
InitTcpReady(&ready);
#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif
server_args.signal = &ready;
start_thread(test_server_nofail, &server_args, &serverThread);
wait_tcp_ready(&server_args);
Expand Down Expand Up @@ -512,10 +504,6 @@ int test_wolfSSL_BIO_connect(void)
XMEMSET(&server_args, 0, sizeof(func_args));
StartTCP();
InitTcpReady(&ready);
#if defined(USE_WINDOWS_API)
/* use RNG to get random port if using windows */
ready.port = GetRandomPort();
#endif
server_args.signal = &ready;
start_thread(test_server_nofail, &server_args, &serverThread);
wait_tcp_ready(&server_args);
Expand Down
6 changes: 2 additions & 4 deletions wolfssl/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,8 +1697,7 @@ static WC_INLINE void tcp_listen(SOCKET_T* sockfd, word16* port, int useAnyAddr,
if (listen(*sockfd, SOCK_LISTEN_MAX_QUEUE) != 0)
err_sys_with_errno("tcp listen failed");
}
#if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_TIRTOS) \
&& !defined(WOLFSSL_ZEPHYR)
#if !defined(WOLFSSL_TIRTOS) && !defined(WOLFSSL_ZEPHYR)
if (*port == 0) {
socklen_t len = sizeof(addr);
if (getsockname(*sockfd, (struct sockaddr*)&addr, &len) == 0) {
Expand Down Expand Up @@ -1770,8 +1769,7 @@ static WC_INLINE void udp_accept(SOCKET_T* sockfd, SOCKET_T* clientfd,
if (bind(*sockfd, (const struct sockaddr*)&addr, sizeof(addr)) != 0)
err_sys_with_errno("tcp bind failed");

#if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_TIRTOS) && \
!defined(SINGLE_THREADED)
#if !defined(WOLFSSL_TIRTOS) && !defined(SINGLE_THREADED)
if (port == 0) {
socklen_t len = sizeof(addr);
if (getsockname(*sockfd, (struct sockaddr*)&addr, &len) == 0) {
Expand Down
Loading