From 1d69c8f0393337d4f222cc1af1af813d77922c84 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 27 Oct 2025 07:11:12 -0700 Subject: Remove the ability to get sockaddrs from endpoints. There is no valid use for this, once we added the ability to query the bound port. --- src/sp/transport/dtls/dtls.c | 21 --------------------- src/sp/transport/inproc/inproc.c | 15 --------------- src/sp/transport/ipc/ipc_test.c | 3 --- 3 files changed, 39 deletions(-) (limited to 'src/sp') diff --git a/src/sp/transport/dtls/dtls.c b/src/sp/transport/dtls/dtls.c index 5ac52838..78933bcd 100644 --- a/src/sp/transport/dtls/dtls.c +++ b/src/sp/transport/dtls/dtls.c @@ -1513,23 +1513,6 @@ dtls_ep_get_port(void *arg, void *buf, size_t *szp, nni_type t) return (nni_copyout_int(port, buf, szp, t)); } -static nng_err -dtls_ep_get_locaddr(void *arg, void *v, size_t *szp, nni_opt_type t) -{ - dtls_ep *ep = arg; - nng_sockaddr sa; - - nni_mtx_lock(&ep->mtx); - if (ep->udp != NULL) { - (void) nng_udp_sockname(ep->udp, &sa); - } else { - sa = ep->self_sa; - } - nni_mtx_unlock(&ep->mtx); - - return (nni_copyout_sockaddr(&sa, v, szp, t)); -} - static nng_err dtls_ep_get_recvmaxsz(void *arg, void *v, size_t *szp, nni_opt_type t) { @@ -1686,10 +1669,6 @@ static const nni_option dtls_ep_opts[] = { .o_get = dtls_ep_get_recvmaxsz, .o_set = dtls_ep_set_recvmaxsz, }, - { - .o_name = NNG_OPT_LOCADDR, - .o_get = dtls_ep_get_locaddr, - }, { .o_name = NNG_OPT_BOUND_PORT, .o_get = dtls_ep_get_port, diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c index dc95e1e4..ff692681 100644 --- a/src/sp/transport/inproc/inproc.c +++ b/src/sp/transport/inproc/inproc.c @@ -547,17 +547,6 @@ inproc_ep_set_recvmaxsz(void *arg, const void *v, size_t sz, nni_opt_type t) return (rv); } -static nng_err -inproc_ep_get_addr(void *arg, void *v, size_t *szp, nni_opt_type t) -{ - inproc_ep *ep = arg; - nng_sockaddr sa; - sa.s_inproc.sa_family = NNG_AF_INPROC; - nni_strlcpy( - sa.s_inproc.sa_name, ep->addr, sizeof(sa.s_inproc.sa_name)); - return (nni_copyout_sockaddr(&sa, v, szp, t)); -} - static const nni_option inproc_pipe_options[] = { // terminate list { @@ -605,10 +594,6 @@ static const nni_option inproc_ep_options[] = { .o_get = inproc_ep_get_recvmaxsz, .o_set = inproc_ep_set_recvmaxsz, }, - { - .o_name = NNG_OPT_LOCADDR, - .o_get = inproc_ep_get_addr, - }, // terminate list { .o_name = NULL, diff --git a/src/sp/transport/ipc/ipc_test.c b/src/sp/transport/ipc/ipc_test.c index 3131e774..d550592a 100644 --- a/src/sp/transport/ipc/ipc_test.c +++ b/src/sp/transport/ipc/ipc_test.c @@ -67,9 +67,6 @@ test_ipc_dialer_properties(void) NUTS_ADDR(addr, "ipc"); NUTS_OPEN(s); NUTS_PASS(nng_dial(s, addr, &d, NNG_FLAG_NONBLOCK)); - // Dialers don't have local addresses. - NUTS_FAIL(nng_dialer_get_addr(d, NNG_OPT_LOCADDR, &sa), NNG_ENOTSUP); - NUTS_FAIL(nng_dialer_set_addr(d, NNG_OPT_LOCADDR, &sa), NNG_ENOTSUP); z = 8192; NUTS_PASS(nng_dialer_set_size(d, NNG_OPT_RECVMAXSZ, z)); -- cgit v1.2.3-70-g09d2