diff options
Diffstat (limited to 'src/supplemental')
| -rw-r--r-- | src/supplemental/http/http_server.c | 2 | ||||
| -rw-r--r-- | src/supplemental/tls/tls_test.c | 18 | ||||
| -rw-r--r-- | src/supplemental/websocket/wssfile_test.c | 8 |
3 files changed, 11 insertions, 17 deletions
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c index d1e8a5e7..d24e5bba 100644 --- a/src/supplemental/http/http_server.c +++ b/src/supplemental/http/http_server.c @@ -871,7 +871,7 @@ http_server_start(nni_http_server *s) if (s->port == 0) { int port; nng_stream_listener_get_int( - s->listener, NNG_OPT_TCP_BOUND_PORT, &port); + s->listener, NNG_OPT_BOUND_PORT, &port); s->port = (uint32_t) port; } nng_stream_listener_accept(s->listener, &s->accaio); diff --git a/src/supplemental/tls/tls_test.c b/src/supplemental/tls/tls_test.c index cbe9c0b9..a9c78ba2 100644 --- a/src/supplemental/tls/tls_test.c +++ b/src/supplemental/tls/tls_test.c @@ -100,8 +100,7 @@ test_tls_large_message(void) c1, nuts_server_crt, nuts_server_key, NULL)); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); @@ -187,8 +186,7 @@ test_tls_ecdsa(void) c1, nuts_ecdsa_server_crt, nuts_ecdsa_server_key, NULL)); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); @@ -274,8 +272,7 @@ test_tls_null_server_name(void) c1, nuts_server_crt, nuts_server_key, NULL)); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); @@ -383,8 +380,7 @@ test_tls_psk(void) NUTS_PASS(nng_tls_config_psk(c1, "identity", key, sizeof(key))); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); @@ -477,8 +473,7 @@ test_tls_psk_server_identities(void) NUTS_PASS(nng_tls_config_psk(c1, identity, key, sizeof(key))); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); @@ -567,8 +562,7 @@ test_tls_psk_bad_identity(void) NUTS_PASS(nng_tls_config_psk(c1, "identity1", key, sizeof(key))); NUTS_PASS(nng_stream_listener_set_tls(l, c1)); NUTS_PASS(nng_stream_listener_listen(l)); - NUTS_PASS( - nng_stream_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_stream_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); NUTS_TRUE(port > 0); NUTS_TRUE(port < 65536); diff --git a/src/supplemental/websocket/wssfile_test.c b/src/supplemental/websocket/wssfile_test.c index dde71129..c42290ef 100644 --- a/src/supplemental/websocket/wssfile_test.c +++ b/src/supplemental/websocket/wssfile_test.c @@ -81,7 +81,7 @@ test_invalid_verify(void) NUTS_PASS(nng_listener_create(&l, s1, addr)); init_listener_wss_file(l); NUTS_PASS(nng_listener_start(l, 0)); - NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); nng_msleep(100); @@ -128,7 +128,7 @@ test_no_verify(void) NUTS_PASS(nng_listener_create(&l, s1, addr)); init_listener_wss_file(l); NUTS_PASS(nng_listener_start(l, 0)); - NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); nng_msleep(100); snprintf(addr, sizeof(addr), "wss://127.0.0.1:%u/test", port); @@ -178,7 +178,7 @@ test_verify_works(void) NUTS_PASS(nng_listener_create(&l, s1, addr)); init_listener_wss_file(l); NUTS_PASS(nng_listener_start(l, 0)); - NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); // It can take a bit for the listener to start up in clouds. nng_msleep(200); @@ -239,7 +239,7 @@ test_tls_config(void) init_listener_wss_file(l); NUTS_PASS(nng_listener_start(l, 0)); - NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port)); + NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port)); // make sure we cannot change the auth mode while running |