diff options
Diffstat (limited to 'src/sp/transport/ws')
| -rw-r--r-- | src/sp/transport/ws/ws_test.c | 7 | ||||
| -rw-r--r-- | src/sp/transport/ws/wss_test.c | 27 |
2 files changed, 9 insertions, 25 deletions
diff --git a/src/sp/transport/ws/ws_test.c b/src/sp/transport/ws/ws_test.c index 6f41fe99..c69e5845 100644 --- a/src/sp/transport/ws/ws_test.c +++ b/src/sp/transport/ws/ws_test.c @@ -205,25 +205,22 @@ static void check_props_v4(nng_msg *msg) { nng_pipe p; - size_t z; nng_sockaddr la; nng_sockaddr ra; bool b; p = nng_msg_get_pipe(msg); NUTS_TRUE(nng_pipe_id(p) > 0); - NUTS_PASS(nng_pipe_get_addr(p, NNG_OPT_LOCADDR, &la)); - NUTS_FAIL(nng_pipe_get_size(p, NNG_OPT_LOCADDR, &z), NNG_EBADTYPE); + NUTS_PASS(nng_pipe_self_addr(p, &la)); NUTS_TRUE(la.s_family == NNG_AF_INET); NUTS_TRUE(la.s_in.sa_port != 0); NUTS_TRUE(la.s_in.sa_addr == nuts_be32(0x7f000001)); - NUTS_PASS(nng_pipe_get_addr(p, NNG_OPT_REMADDR, &ra)); + NUTS_PASS(nng_pipe_peer_addr(p, &ra)); NUTS_TRUE(ra.s_family == NNG_AF_INET); NUTS_TRUE(ra.s_in.sa_port != 0); NUTS_TRUE(ra.s_in.sa_addr == nuts_be32(0x7f000001)); NUTS_TRUE(ra.s_in.sa_port != la.s_in.sa_port); - NUTS_FAIL(nng_pipe_get_size(p, NNG_OPT_REMADDR, &z), NNG_EBADTYPE); NUTS_PASS(nng_pipe_get_bool(p, NNG_OPT_TCP_KEEPALIVE, &b)); NUTS_TRUE(b == false); // default diff --git a/src/sp/transport/ws/wss_test.c b/src/sp/transport/ws/wss_test.c index 1686090b..0654c809 100644 --- a/src/sp/transport/ws/wss_test.c +++ b/src/sp/transport/ws/wss_test.c @@ -75,9 +75,9 @@ test_wss_port_zero_bind(void) nng_socket s1; nng_socket s2; nng_tls_config *c1, *c2; - nng_sockaddr sa; nng_listener l; nng_dialer d; + int port; const nng_url *url; c1 = wss_server_config(); @@ -88,11 +88,10 @@ test_wss_port_zero_bind(void) NUTS_PASS(nng_listener_set_tls(l, c1)); NUTS_PASS(nng_listener_start(l, 0)); NUTS_PASS(nng_listener_get_url(l, &url)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); + NUTS_TRUE(port > 0); + NUTS_TRUE(port <= 65535); NUTS_MATCH(nng_url_scheme(url), "wss"); - NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa)); - NUTS_TRUE(sa.s_in.sa_family == NNG_AF_INET); - NUTS_TRUE(sa.s_in.sa_port != 0); - NUTS_TRUE(sa.s_in.sa_addr = nuts_be32(0x7f000001)); NUTS_PASS(nng_dialer_create_url(&d, s2, url)); NUTS_PASS(nng_dialer_set_tls(d, c2)); NUTS_PASS(nng_dialer_start(d, 0)); @@ -108,7 +107,6 @@ test_wss_bad_cert_mutual(void) nng_socket s1; nng_socket s2; nng_tls_config *c1, *c2; - nng_sockaddr sa; nng_listener l; nng_dialer d; const nng_url *url; @@ -128,10 +126,6 @@ test_wss_bad_cert_mutual(void) NUTS_PASS(nng_listener_start(l, 0)); NUTS_PASS(nng_listener_get_url(l, &url)); NUTS_MATCH(nng_url_scheme(url), "wss"); - NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa)); - NUTS_TRUE(sa.s_in.sa_family == NNG_AF_INET); - NUTS_TRUE(sa.s_in.sa_port != 0); - NUTS_TRUE(sa.s_in.sa_addr = nuts_be32(0x7f000001)); NUTS_PASS(nng_dialer_create_url(&d, s2, url)); NUTS_PASS(nng_dialer_set_tls(d, c2)); #ifdef NNG_TLS_ENGINE_MBEDTLS @@ -153,7 +147,6 @@ test_wss_cert_mutual(void) nng_socket s1; nng_socket s2; nng_tls_config *c1, *c2; - nng_sockaddr sa; nng_listener l; nng_dialer d; const nng_url *url; @@ -172,10 +165,6 @@ test_wss_cert_mutual(void) NUTS_PASS(nng_listener_start(l, 0)); NUTS_PASS(nng_listener_get_url(l, &url)); NUTS_MATCH(nng_url_scheme(url), "wss"); - NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa)); - NUTS_TRUE(sa.s_in.sa_family == NNG_AF_INET); - NUTS_TRUE(sa.s_in.sa_port != 0); - NUTS_TRUE(sa.s_in.sa_addr = nuts_be32(0x7f000001)); NUTS_PASS(nng_dialer_create_url(&d, s2, url)); NUTS_PASS(nng_dialer_set_tls(d, c2)); NUTS_PASS(nng_dialer_start(d, 0)); @@ -387,7 +376,7 @@ test_wss_pipe_details(void) nng_socket s1; nng_socket s2; nng_tls_config *c1, *c2; - nng_sockaddr sa; + int port; nng_listener l; nng_dialer d; nng_msg *msg; @@ -408,10 +397,8 @@ test_wss_pipe_details(void) NUTS_PASS(nng_listener_start(l, 0)); NUTS_PASS(nng_listener_get_url(l, &url)); NUTS_MATCH(nng_url_scheme(url), "wss"); - NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa)); - NUTS_TRUE(sa.s_in.sa_family == NNG_AF_INET); - NUTS_TRUE(sa.s_in.sa_port != 0); - NUTS_TRUE(sa.s_in.sa_addr = nuts_be32(0x7f000001)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); + NUTS_TRUE(port != 0); NUTS_PASS(nng_dialer_create_url(&d, s2, url)); NUTS_PASS(nng_dialer_set_tls(d, c2)); NUTS_PASS(nng_dialer_start(d, 0)); |