From ae944a8de32c107eea9427104e153c25e4a681f1 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 6 Aug 2018 19:01:12 +0300 Subject: Revert "fixes #599 nng_dial sync should not return until added to socket" This changeset needs work. We are seeing errors described by This reverts commit d7f7c896c0ede24249ef63b1e45b1878bf4bd473. --- tests/tls.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/tls.c b/tests/tls.c index 01e49aa7..1f1f244c 100644 --- a/tests/tls.c +++ b/tests/tls.c @@ -265,6 +265,7 @@ init_listener_tls_file(nng_listener l) } TestMain("TLS Transport", { + static trantest tt; tt.dialer_init = init_dialer_tls; @@ -290,39 +291,28 @@ TestMain("TLS Transport", { }); Convey("We can bind to wild card", { - nng_socket s1; - nng_socket s2; - char addr[NNG_MAXADDRLEN]; - nng_listener l; - nng_dialer d; + nng_socket s1; + nng_socket s2; + char addr[NNG_MAXADDRLEN]; So(nng_tls_register() == 0); - So(nng_pair_open(&s1) == 0); So(nng_pair_open(&s2) == 0); - Reset({ nng_close(s2); nng_close(s1); }); trantest_next_address(addr, "tls+tcp://*:%u"); - So(nng_listener_create(&l, s1, addr) == 0); - So(init_listener_tls(l) == 0); + So(nng_listen(s1, addr, NULL, 0) == 0); + // reset port back one trantest_prev_address(addr, "tls+tcp://127.0.0.1:%u"); - 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); + So(nng_dial(s2, addr, NULL, 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; @@ -333,16 +323,10 @@ TestMain("TLS Transport", { nng_close(s2); nng_close(s1); }); - 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); + So(nng_listen(s1, "tls+tcp://127.0.0.1:0", &l, 0) == 0); sz = NNG_MAXADDRLEN; So(nng_listener_getopt_string(l, NNG_OPT_URL, &addr) == 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); + So(nng_dial(s2, addr, NULL, 0) == 0); nng_strfree(addr); }); @@ -588,4 +572,5 @@ TestMain("TLS Transport", { So(nng_dialer_getopt_bool(d, NNG_OPT_TCP_KEEPALIVE, &v) == 0); So(v == true); }); + }) -- cgit v1.2.3-70-g09d2