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

1 files changed, 0 insertions, 31 deletions

diff --git a/src/core/stream.c b/src/core/stream.c
index b1cb5d7b..c06bb1e3 100644
--- a/src/core/stream.c
+++ b/src/core/stream.c
@@ -164,15 +164,6 @@ nng_err
 nni_stream_get(
     nng_stream *s, const char *nm, void *data, size_t *szp, nni_type t)
 {
-	// TODO: eventually this needs die
-	if ((strcmp(nm, NNG_OPT_REMADDR) == 0) ||
-	    (strcmp(nm, NNG_OPT_LOCADDR) == 0)) {
-		if (t != NNI_TYPE_SOCKADDR) {
-			return (NNG_EBADTYPE);
-		}
-		return (nng_stream_get_addr(s, nm, (nng_sockaddr *) data));
-	}
-
 	return (s->s_get(s, nm, data, szp, t));
 }
 
@@ -397,21 +388,6 @@ nng_stream_get_ms(nng_stream *s, const char *n, nng_duration *v)
 	return (nni_stream_get(s, n, v, NULL, NNI_TYPE_DURATION));
 }
 
-nng_err
-nng_stream_get_addr(nng_stream *s, const char *n, nng_sockaddr *v)
-{
-	const nng_sockaddr *sap;
-	if (strcmp(n, NNG_OPT_LOCADDR) == 0) {
-		sap = nng_stream_self_addr(s);
-	} else if (strcmp(n, NNG_OPT_REMADDR) == 0) {
-		sap = nng_stream_peer_addr(s);
-	} else {
-		return (NNG_ENOTSUP);
-	}
-	memcpy(v, sap, sizeof(nng_sockaddr));
-	return (NNG_OK);
-}
-
 const nng_sockaddr *
 nng_stream_self_addr(nng_stream *s)
 {
@@ -510,13 +486,6 @@ nng_stream_listener_get_ms(
 }
 
 nng_err
-nng_stream_listener_get_addr(
-    nng_stream_listener *l, const char *n, nng_sockaddr *v)
-{
-	return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_SOCKADDR));
-}
-
-nng_err
 nng_stream_listener_get_tls(nng_stream_listener *l, nng_tls_config **cfgp)
 {
 	return (nni_stream_listener_get_tls(l, cfgp));