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.

8 files changed, 0 insertions, 88 deletions

diff --git a/src/core/stream.c b/src/core/stream.c
index c06bb1e3..c5e719ea 100644
--- a/src/core/stream.c
+++ b/src/core/stream.c
@@ -441,13 +441,6 @@ nng_stream_dialer_get_ms(nng_stream_dialer *d, const char *n, nng_duration *v)
 }
 
 nng_err
-nng_stream_dialer_get_addr(
-    nng_stream_dialer *d, const char *n, nng_sockaddr *v)
-{
-	return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_SOCKADDR));
-}
-
-nng_err
 nng_stream_dialer_get_tls(nng_stream_dialer *d, nng_tls_config **cfgp)
 {
 	return (nni_stream_dialer_get_tls(d, cfgp));
diff --git a/src/nng.c b/src/nng.c
index 82b1eb91..0b1c2f56 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -792,12 +792,6 @@ nng_dialer_get_ms(nng_dialer id, const char *n, nng_duration *v)
 }
 
 int
-nng_dialer_get_addr(nng_dialer id, const char *n, nng_sockaddr *v)
-{
-	return (dialer_get(id, n, v, NULL, NNI_TYPE_SOCKADDR));
-}
-
-int
 nng_dialer_get_tls(nng_dialer id, nng_tls_config **cfgp)
 {
 	int         rv;
diff --git a/src/platform/posix/posix_tcpdial.c b/src/platform/posix/posix_tcpdial.c
index 12fa990f..c526185f 100644
--- a/src/platform/posix/posix_tcpdial.c
+++ b/src/platform/posix/posix_tcpdial.c
@@ -341,20 +341,6 @@ tcp_dialer_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
 }
 
 static nng_err
-tcp_dialer_get_locaddr(void *arg, void *buf, size_t *szp, nni_type t)
-{
-	nni_tcp_dialer *d = arg;
-	nng_sockaddr    sa;
-
-	nni_mtx_lock(&d->mtx);
-	if (nni_posix_sockaddr2nn(&sa, &d->src, d->srclen) != 0) {
-		sa.s_family = NNG_AF_UNSPEC;
-	}
-	nni_mtx_unlock(&d->mtx);
-	return (nni_copyout_sockaddr(&sa, buf, szp, t));
-}
-
-static nng_err
 tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t)
 {
 	nni_tcp_dialer         *d = arg;
@@ -412,7 +398,6 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t)
 static const nni_option tcp_dialer_options[] = {
 	{
 	    .o_name = NNG_OPT_LOCADDR,
-	    .o_get  = tcp_dialer_get_locaddr,
 	    .o_set  = tcp_dialer_set_locaddr,
 	},
 	{
diff --git a/src/platform/tcp_stream_test.c b/src/platform/tcp_stream_test.c
index 3dffed82..faf5e662 100644
--- a/src/platform/tcp_stream_test.c
+++ b/src/platform/tcp_stream_test.c
@@ -425,12 +425,6 @@ test_tcp_dialer_loc_addr(void)
 	nng_stream_dialer *d;
 	nng_sockaddr       sa;
 	NUTS_PASS(nng_stream_dialer_alloc(&d, "tcp://127.0.0.1:80"));
-	NUTS_PASS(nng_stream_dialer_get_addr(d, NNG_OPT_LOCADDR, &sa));
-	NUTS_TRUE(sa.s_family == NNG_AF_UNSPEC);
-
-	// cannot set a local port
-	sa.s_in.sa_family = NNG_AF_INET;
-	sa.s_in.sa_port   = 8080;
 	NUTS_FAIL(nng_stream_dialer_set_addr(d, NNG_OPT_LOCADDR, &sa),
 	    NNG_EADDRINVAL);
 
diff --git a/src/platform/windows/win_tcpdial.c b/src/platform/windows/win_tcpdial.c
index a3d64869..c03d564f 100644
--- a/src/platform/windows/win_tcpdial.c
+++ b/src/platform/windows/win_tcpdial.c
@@ -311,20 +311,6 @@ tcp_dialer_get_keepalive(void *arg, void *buf, size_t *szp, nni_type t)
 }
 
 static nng_err
-tcp_dialer_get_locaddr(void *arg, void *buf, size_t *szp, nni_type t)
-{
-	nni_tcp_dialer *d = arg;
-	nng_sockaddr    sa;
-
-	nni_mtx_lock(&d->mtx);
-	if (nni_win_sockaddr2nn(&sa, &d->src, sizeof(d->src)) != 0) {
-		sa.s_family = NNG_AF_UNSPEC;
-	}
-	nni_mtx_unlock(&d->mtx);
-	return (nni_copyout_sockaddr(&sa, buf, szp, t));
-}
-
-static nng_err
 tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t)
 {
 	nni_tcp_dialer     *d = arg;
@@ -380,7 +366,6 @@ tcp_dialer_set_locaddr(void *arg, const void *buf, size_t sz, nni_type t)
 static const nni_option tcp_dialer_options[] = {
 	{
 	    .o_name = NNG_OPT_LOCADDR,
-	    .o_get  = tcp_dialer_get_locaddr,
 	    .o_set  = tcp_dialer_set_locaddr,
 	},
 	{
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
@@ -1514,23 +1514,6 @@ dtls_ep_get_port(void *arg, void *buf, size_t *szp, nni_type 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)
 {
 	dtls_ep *ep = arg;
@@ -1687,10 +1670,6 @@ static const nni_option dtls_ep_opts[] = {
 	    .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));