From be13c2e8845423cec17af429fc4e16a5d9749e47 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 26 Oct 2025 10:54:58 -0700 Subject: Replace nng_pipe_get_addr, nng_stream_get_addr, and the NNG_OPT_REMADDR option. More direct access methods are provided instead. This results in much lower friction when using, and is a step on the path to removing NNG_OPT_LOCADDR as well. We need to figure a solution for NNG_OPT_LOCADDR for dialers; for listeners there is little use in it either, and it will be removed. (Dialers will probably get a new NNG_OPT_BIND_IP option.) --- src/supplemental/tls/tls_stream.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/supplemental/tls') diff --git a/src/supplemental/tls/tls_stream.c b/src/supplemental/tls/tls_stream.c index d0a1fabd..b523e583 100644 --- a/src/supplemental/tls/tls_stream.c +++ b/src/supplemental/tls/tls_stream.c @@ -111,10 +111,10 @@ tls_stream_recv(void *arg, nng_aio *aio) static void tls_stream_conn_cb(void *arg) { - tls_stream *ts = arg; - nng_stream *bio; - int rv; - nng_sockaddr sa; + tls_stream *ts = arg; + nng_stream *bio; + int rv; + const nng_sockaddr *sa; if ((rv = nni_aio_result(&ts->conn_aio)) != 0) { nni_aio_finish_error(ts->user_aio, rv); @@ -123,13 +123,9 @@ tls_stream_conn_cb(void *arg) } bio = nni_aio_get_output(&ts->conn_aio, 0); - if ((rv = nng_stream_get_addr(bio, NNG_OPT_REMADDR, &sa)) != 0) { - nni_aio_finish_error(ts->user_aio, rv); - nni_tls_stream_free(ts); - return; - }; + sa = nng_stream_peer_addr(bio); - if ((rv = nni_tls_start(&ts->conn, &tls_stream_bio, bio, &sa)) != 0) { + if ((rv = nni_tls_start(&ts->conn, &tls_stream_bio, bio, sa)) != 0) { // NB: if this fails, it *will* have set the bio either way. // So nni_tls_stream_free will also free the bio. nni_aio_finish_error(ts->user_aio, rv); -- cgit v1.2.3-70-g09d2