From e3f1d0805778cfb29afdae284ad9b5dbabe18579 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 4 Jan 2025 12:24:31 -0800 Subject: tests: TLS transport test resilience against EADDRINUSE This was occasionally causing "sigabrt" and similar failures in the tests. --- src/sp/transport/tls/tls_tran_test.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/sp') diff --git a/src/sp/transport/tls/tls_tran_test.c b/src/sp/transport/tls/tls_tran_test.c index 23471e59..8ecf5099 100644 --- a/src/sp/transport/tls/tls_tran_test.c +++ b/src/sp/transport/tls/tls_tran_test.c @@ -301,8 +301,9 @@ test_tls_recv_max(void) nng_dialer d; size_t sz; char *addr; + const nng_url *url; - NUTS_ADDR(addr, "tls+tcp"); + NUTS_ADDR_ZERO(addr, "tls+tcp"); c0 = tls_server_config(); c1 = tls_client_config(); @@ -315,9 +316,10 @@ test_tls_recv_max(void) NUTS_TRUE(sz == 200); NUTS_PASS(nng_listener_set_size(l, NNG_OPT_RECVMAXSZ, 100)); NUTS_PASS(nng_listener_start(l, 0)); + NUTS_PASS(nng_listener_get_url(l, &url)); NUTS_OPEN(s1); - NUTS_PASS(nng_dialer_create(&d, s1, addr)); + NUTS_PASS(nng_dialer_create_url(&d, s1, url)); NUTS_PASS(nng_dialer_set_tls(d, c1)); NUTS_PASS(nng_dialer_start(d, 0)); NUTS_PASS(nng_send(s1, msg, 95, 0)); @@ -346,12 +348,13 @@ test_tls_psk(void) size_t sz; char *addr; uint8_t key[32]; + const nng_url *url; for (unsigned i = 0; i < sizeof(key); i++) { key[i] = rand() % 0xff; } - NUTS_ADDR(addr, "tls+tcp"); + NUTS_ADDR_ZERO(addr, "tls+tcp"); c0 = tls_config_psk(NNG_TLS_MODE_SERVER, "identity", key, sizeof key); c1 = tls_config_psk(NNG_TLS_MODE_CLIENT, "identity", key, sizeof key); @@ -360,9 +363,10 @@ test_tls_psk(void) NUTS_PASS(nng_listener_create(&l, s0, addr)); NUTS_PASS(nng_listener_set_tls(l, c0)); NUTS_PASS(nng_listener_start(l, 0)); + NUTS_PASS(nng_listener_get_url(l, &url)); NUTS_OPEN(s1); - NUTS_PASS(nng_dialer_create(&d, s1, addr)); + NUTS_PASS(nng_dialer_create_url(&d, s1, url)); NUTS_PASS(nng_dialer_set_tls(d, c1)); NUTS_PASS(nng_dialer_start(d, 0)); NUTS_PASS(nng_send(s1, msg, 95, 0)); -- cgit v1.2.3-70-g09d2