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.)

2 files changed, 0 insertions, 50 deletions

diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index 02eb088a..016c222b 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -993,28 +993,12 @@ udp_pipe_get_recvmax(void *arg, void *v, size_t *szp, nni_type t)
 	return (rv);
 }
 
-static nng_err
-udp_pipe_get_remaddr(void *arg, void *v, size_t *szp, nni_type t)
-{
-	udp_pipe *p  = arg;
-	udp_ep   *ep = p->ep;
-	nng_err   rv;
-	nni_mtx_lock(&ep->mtx);
-	rv = nni_copyout_sockaddr(&p->peer_addr, v, szp, t);
-	nni_mtx_unlock(&ep->mtx);
-	return (rv);
-}
-
 static nni_option udp_pipe_options[] = {
 	{
 	    .o_name = NNG_OPT_RECVMAXSZ,
 	    .o_get  = udp_pipe_get_recvmax,
 	},
 	{
-	    .o_name = NNG_OPT_REMADDR,
-	    .o_get  = udp_pipe_get_remaddr,
-	},
-	{
 	    .o_name = NULL,
 	},
 };
@@ -1547,22 +1531,6 @@ udp_ep_get_locaddr(void *arg, void *v, size_t *szp, nni_opt_type t)
 }
 
 static nng_err
-udp_ep_get_remaddr(void *arg, void *v, size_t *szp, nni_opt_type t)
-{
-	udp_ep      *ep = arg;
-	nng_err      rv;
-	nng_sockaddr sa;
-
-	if (!ep->dialer) {
-		return (NNG_ENOTSUP);
-	}
-	sa = ep->peer_sa;
-
-	rv = nni_copyout_sockaddr(&sa, v, szp, t);
-	return (rv);
-}
-
-static nng_err
 udp_ep_get_recvmaxsz(void *arg, void *v, size_t *szp, nni_opt_type t)
 {
 	udp_ep *ep = arg;
@@ -1736,10 +1704,6 @@ static const nni_option udp_ep_opts[] = {
 	    .o_get  = udp_ep_get_locaddr,
 	},
 	{
-	    .o_name = NNG_OPT_REMADDR,
-	    .o_get  = udp_ep_get_remaddr,
-	},
-	{
 	    .o_name = NNG_OPT_BOUND_PORT,
 	    .o_get  = udp_ep_get_port,
 	},
diff --git a/src/sp/transport/udp/udp_tran_test.c b/src/sp/transport/udp/udp_tran_test.c
index 33517246..45203df1 100644
--- a/src/sp/transport/udp/udp_tran_test.c
+++ b/src/sp/transport/udp/udp_tran_test.c
@@ -60,7 +60,6 @@ test_udp_port_zero_bind(void)
 {
 	nng_socket     s1;
 	nng_socket     s2;
-	nng_sockaddr   sa;
 	nng_listener   l;
 	nng_dialer     d;
 	int            port;
@@ -76,10 +75,6 @@ test_udp_port_zero_bind(void)
 	NUTS_MATCH(nng_url_scheme(u1), "udp");
 	NUTS_MATCH(nng_url_hostname(u1), "127.0.0.1");
 	NUTS_MATCH(nng_url_path(u1), "");
-	NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa));
-	NUTS_TRUE(sa.s_in.sa_family == NNG_AF_INET);
-	NUTS_TRUE(sa.s_in.sa_port == nuts_be16(nng_url_port(u1)));
-	NUTS_TRUE(sa.s_in.sa_addr == nuts_be32(0x7f000001));
 	NUTS_PASS(nng_dial_url(s2, u1, &d, 0));
 	NUTS_PASS(nng_dialer_get_url(d, &u2));
 	NUTS_MATCH(nng_url_scheme(u1), nng_url_scheme(u2));
@@ -465,9 +460,6 @@ test_udp_pipe(void)
 	size_t       sz;
 	char        *addr;
 	nng_msg     *msg;
-	nng_pipe     p;
-	nng_sockaddr sa0;
-	nng_sockaddr sa1;
 
 	NUTS_ADDR(addr, "udp4");
 
@@ -478,7 +470,6 @@ test_udp_pipe(void)
 	NUTS_PASS(nng_listener_get_size(l, NNG_OPT_UDP_COPY_MAX, &sz));
 	NUTS_TRUE(sz == 100);
 	NUTS_PASS(nng_listener_start(l, 0));
-	NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa0));
 
 	NUTS_OPEN(s1);
 	NUTS_PASS(nng_dial(s1, addr, NULL, 0));
@@ -488,10 +479,7 @@ test_udp_pipe(void)
 	NUTS_PASS(nng_msg_alloc(&msg, 0));
 	NUTS_PASS(nng_sendmsg(s0, msg, 0));
 	NUTS_PASS(nng_recvmsg(s1, &msg, 0));
-	p = nng_msg_get_pipe(msg);
-	NUTS_PASS(nng_pipe_get_addr(p, NNG_OPT_REMADDR, &sa1));
 
-	NUTS_TRUE(memcmp(&sa0.s_in, &sa1.s_in, sizeof(sa0.s_in)) == 0);
 	nng_msg_free(msg);
 	NUTS_CLOSE(s0);
 	NUTS_CLOSE(s1);
@@ -506,7 +494,6 @@ test_udp_reconnect_dialer(void)
 	nng_dialer   d;
 	char        *addr;
 	nng_msg     *msg;
-	nng_sockaddr sa0;
 
 	NUTS_LOGGING();
 	NUTS_ADDR(addr, "udp4");
@@ -519,7 +506,6 @@ test_udp_reconnect_dialer(void)
 	NUTS_PASS(nng_socket_set_ms(s0, NNG_OPT_SENDTIMEO, 2000));
 	NUTS_PASS(nng_listener_create(&l, s0, addr));
 	NUTS_PASS(nng_listener_start(l, 0));
-	NUTS_PASS(nng_listener_get_addr(l, NNG_OPT_LOCADDR, &sa0));
 
 	NUTS_PASS(nng_sub0_open(&s1));
 	NUTS_PASS(nng_sub0_socket_subscribe(s1, "", 0));