diff options
| author | Garrett D'Amore <garrett@damore.org> | 2021-01-25 21:39:33 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2021-02-07 13:43:44 -0800 |
| commit | b8dc6722281e4d5bd0959a641b63333b605cf608 (patch) | |
| tree | 64a0f8eb6e5ed63435c57cafa5b8ac293a884786 | |
| parent | e9c28eed5ffb8da59ba8a6805e85936f04bdb644 (diff) | |
| download | nng-b8dc6722281e4d5bd0959a641b63333b605cf608.tar.gz nng-b8dc6722281e4d5bd0959a641b63333b605cf608.tar.bz2 nng-b8dc6722281e4d5bd0959a641b63333b605cf608.zip | |
fixes #1421 Failure in tcp and tls local source handling
| -rw-r--r-- | src/sp/transport/tcp/tcp.c | 9 | ||||
| -rw-r--r-- | src/sp/transport/tcp/tcp_test.c | 6 | ||||
| -rw-r--r-- | src/sp/transport/tls/tls.c | 3 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c index 524c6988..8b7403b6 100644 --- a/src/sp/transport/tcp/tcp.c +++ b/src/sp/transport/tcp/tcp.c @@ -1,5 +1,5 @@ // -// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -84,12 +84,12 @@ static void tcptran_pipe_fini(void *); static nni_reap_list tcptran_ep_reap_list = { .rl_offset = offsetof(tcptran_ep, reap), - .rl_func = tcptran_ep_fini, + .rl_func = tcptran_ep_fini, }; static nni_reap_list tcptran_pipe_reap_list = { - .rl_offset = offsetof (tcptran_pipe, reap), - .rl_func = tcptran_pipe_fini, + .rl_offset = offsetof(tcptran_pipe, reap), + .rl_func = tcptran_pipe_fini, }; static int @@ -745,6 +745,7 @@ tcptran_url_parse_source(nng_url *url, nng_sockaddr *sa, const nng_url *surl) nni_resolv_ip(src, "0", af, true, sa, aio); nni_aio_wait(aio); + rv = nni_aio_result(aio); nni_aio_free(aio); nni_free(src, len + 1); return (rv); diff --git a/src/sp/transport/tcp/tcp_test.c b/src/sp/transport/tcp/tcp_test.c index d23227d7..16c70d7d 100644 --- a/src/sp/transport/tcp/tcp_test.c +++ b/src/sp/transport/tcp/tcp_test.c @@ -96,10 +96,12 @@ void test_tcp_bad_local_interface(void) { nng_socket s1; + int rv; NUTS_OPEN(s1); - NUTS_FAIL(nng_dial(s1, "tcp://bogus1;127.0.0.1:80", NULL, 0), - NNG_EADDRINVAL); + rv = nng_dial(s1, "tcp://bogus1;127.0.0.1:80", NULL, 0), + NUTS_TRUE(rv != 0); + NUTS_TRUE(rv != NNG_ECONNREFUSED); NUTS_CLOSE(s1); } diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index b6623733..44431e78 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -1,5 +1,5 @@ // -// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech> // Copyright 2018 Capitar IT Group BV <info@capitar.com> // Copyright 2019 Devolutions <info@devolutions.net> // @@ -714,6 +714,7 @@ tlstran_url_parse_source(nni_url *url, nng_sockaddr *sa, const nni_url *surl) nni_resolv_ip(src, "0", af, 1, sa, aio); nni_aio_wait(aio); + rv = nni_aio_result(aio); nni_aio_free(aio); nni_free(src, len + 1); return (rv); |