aboutsummaryrefslogtreecommitdiff
path: root/src/sp
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2021-01-03 16:01:53 -0800
committerGarrett D'Amore <garrett@damore.org>2021-01-10 15:45:07 -0800
commit35533f4b968fc14b80a085e0246aa3074c1dec6f (patch)
tree937909cd8e2a1c8d5424dae13b73cfd4d893a497 /src/sp
parent6a9bd051c439ef66cf00795b3829ca3ceece0497 (diff)
downloadnng-35533f4b968fc14b80a085e0246aa3074c1dec6f.tar.gz
nng-35533f4b968fc14b80a085e0246aa3074c1dec6f.tar.bz2
nng-35533f4b968fc14b80a085e0246aa3074c1dec6f.zip
fixes #1403 http ws listeners added without a lock
Diffstat (limited to 'src/sp')
-rw-r--r--src/sp/transport/ws/ws_test.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/sp/transport/ws/ws_test.c b/src/sp/transport/ws/ws_test.c
index 7cbcd9d7..4a2b58c2 100644
--- a/src/sp/transport/ws/ws_test.c
+++ b/src/sp/transport/ws/ws_test.c
@@ -56,19 +56,16 @@ test_wild_card_port(void)
NUTS_OPEN(s5);
NUTS_OPEN(s6);
NUTS_PASS(nng_listen(s1, "ws://127.0.0.1:0/one", &l1, 0));
- NUTS_PASS(
- nng_listener_get_int(l1, NNG_OPT_TCP_BOUND_PORT, &port1));
+ NUTS_PASS(nng_listener_get_int(l1, NNG_OPT_TCP_BOUND_PORT, &port1));
NUTS_TRUE(port1 != 0);
snprintf(ws_url, sizeof(ws_url), "ws4://127.0.0.1:%d/two", port1);
NUTS_PASS(nng_listen(s2, ws_url, &l2, 0));
- NUTS_PASS(
- nng_listener_get_int(l2, NNG_OPT_TCP_BOUND_PORT, &port2));
+ NUTS_PASS(nng_listener_get_int(l2, NNG_OPT_TCP_BOUND_PORT, &port2));
NUTS_TRUE(port1 != 0);
NUTS_TRUE(port1 == port2);
// Now try a different wild card port.
NUTS_PASS(nng_listen(s3, "ws4://127.0.0.1:0/three", &l3, 0));
- NUTS_PASS(
- nng_listener_get_int(l3, NNG_OPT_TCP_BOUND_PORT, &port3));
+ NUTS_PASS(nng_listener_get_int(l3, NNG_OPT_TCP_BOUND_PORT, &port3));
NUTS_TRUE(port3 != 0);
NUTS_TRUE(port3 != port1);
@@ -147,7 +144,9 @@ test_ws_recv_max(void)
nng_socket s1;
nng_listener l;
size_t sz;
- char *addr;
+ char * addr;
+
+ memset(msg, 0, sizeof(msg)); // required to silence valgrind
NUTS_ADDR(addr, "ws");
NUTS_OPEN(s0);