diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tls.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/tests/tls.c b/tests/tls.c index 1f1f244c..aadc3a3f 100644 --- a/tests/tls.c +++ b/tests/tls.c @@ -265,7 +265,6 @@ init_listener_tls_file(nng_listener l) } TestMain("TLS Transport", { - static trantest tt; tt.dialer_init = init_dialer_tls; @@ -291,9 +290,11 @@ TestMain("TLS Transport", { }); Convey("We can bind to wild card", { - nng_socket s1; - nng_socket s2; - char addr[NNG_MAXADDRLEN]; + nng_socket s1; + nng_socket s2; + char addr[NNG_MAXADDRLEN]; + nng_listener l; + nng_dialer d; So(nng_tls_register() == 0); So(nng_pair_open(&s1) == 0); @@ -303,16 +304,23 @@ TestMain("TLS Transport", { nng_close(s1); }); trantest_next_address(addr, "tls+tcp://*:%u"); - So(nng_listen(s1, addr, NULL, 0) == 0); + So(nng_listener_create(&l, s1, addr) == 0); + So(init_listener_tls(l) == 0); // reset port back one trantest_prev_address(addr, "tls+tcp://127.0.0.1:%u"); - So(nng_dial(s2, addr, NULL, 0) == 0); + So(nng_dialer_create(&d, s2, addr) == 0); + So(init_dialer_tls(d) == 0); + So(nng_dialer_setopt_int( + d, NNG_OPT_TLS_AUTH_MODE, NNG_TLS_AUTH_MODE_NONE) == 0); + So(nng_listener_start(l, 0) == 0); + So(nng_dialer_start(d, 0) == 0); }); Convey("We can bind to port zero", { nng_socket s1; nng_socket s2; nng_listener l; + nng_dialer d; char * addr; size_t sz; @@ -323,10 +331,16 @@ TestMain("TLS Transport", { nng_close(s2); nng_close(s1); }); - So(nng_listen(s1, "tls+tcp://127.0.0.1:0", &l, 0) == 0); + So(nng_listener_create(&l, s1, "tls+tcp://127.0.0.1:0") == 0); + So(init_listener_tls(l) == 0); + So(nng_listener_start(l, 0) == 0); sz = NNG_MAXADDRLEN; So(nng_listener_getopt_string(l, NNG_OPT_URL, &addr) == 0); - So(nng_dial(s2, addr, NULL, 0) == 0); + So(nng_dialer_create(&d, s2, addr) == 0); + So(init_dialer_tls(d) == 0); + So(nng_dialer_setopt_int( + d, NNG_OPT_TLS_AUTH_MODE, NNG_TLS_AUTH_MODE_NONE) == 0); + So(nng_dialer_start(d, 0) == 0); nng_strfree(addr); }); @@ -572,5 +586,4 @@ TestMain("TLS Transport", { So(nng_dialer_getopt_bool(d, NNG_OPT_TCP_KEEPALIVE, &v) == 0); So(v == true); }); - }) |