Plumb sockaddrs all the way through pipes, make them failsafe.

These functions can no longer fail.

3 files changed, 12 insertions, 20 deletions

diff --git a/src/supplemental/http/http_api.h b/src/supplemental/http/http_api.h
index ca13bd09..458621a1 100644
--- a/src/supplemental/http/http_api.h
+++ b/src/supplemental/http/http_api.h
@@ -72,8 +72,8 @@ extern void nni_http_read_chunks(
 extern nni_http_req *nni_http_conn_req(nni_http_conn *);
 extern nni_http_res *nni_http_conn_res(nni_http_conn *);
 
-extern nng_err nni_http_peer_addr(nni_http_conn *, const nng_sockaddr **);
-extern nng_err nni_http_self_addr(nni_http_conn *, const nng_sockaddr **);
+extern const nng_sockaddr *nni_http_peer_addr(nni_http_conn *);
+extern const nng_sockaddr *nni_http_self_addr(nni_http_conn *);
 
 // Private to the server. (Used to support session hijacking.)
 extern void  nni_http_conn_set_ctx(nni_http_conn *, void *);
diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c
index bb3a0882..949194a9 100644
--- a/src/supplemental/http/http_conn.c
+++ b/src/supplemental/http/http_conn.c
@@ -160,16 +160,16 @@ nni_http_conn_close(nni_http_conn *conn)
 	nni_mtx_unlock(&conn->mtx);
 }
 
-nng_err
-nni_http_peer_addr(nni_http_conn *conn, const nng_sockaddr **sap)
+const nng_sockaddr *
+nni_http_peer_addr(nni_http_conn *conn)
 {
-	return nng_stream_peer_addr(conn->sock, sap);
+	return (nng_stream_peer_addr(conn->sock));
 }
 
-nng_err
-nni_http_self_addr(nni_http_conn *conn, const nng_sockaddr **sap)
+const nng_sockaddr *
+nni_http_self_addr(nni_http_conn *conn)
 {
-	return nng_stream_self_addr(conn->sock, sap);
+	return (nng_stream_self_addr(conn->sock));
 }
 
 // http_buf_pull_up pulls the content of the read buffer back to the
diff --git a/src/supplemental/http/http_public.c b/src/supplemental/http/http_public.c
index edf5e609..c5ace172 100644
--- a/src/supplemental/http/http_public.c
+++ b/src/supplemental/http/http_public.c
@@ -309,23 +309,15 @@ nng_http_read_response(nng_http *conn, nng_aio *aio)
 nng_err
 nng_http_remote_address(nng_http *conn, nng_sockaddr *addrp)
 {
-	const nng_sockaddr *sap;
-	nng_err             rv;
-	if ((rv = nni_http_peer_addr(conn, &sap)) == NNG_OK) {
-		*addrp = *sap;
-	}
-	return (rv);
+	*addrp = *(nni_http_peer_addr(conn));
+	return (NNG_OK);
 }
 
 nng_err
 nng_http_local_address(nng_http *conn, nng_sockaddr *addrp)
 {
-	const nng_sockaddr *sap;
-	nng_err             rv;
-	if ((rv = nni_http_self_addr(conn, &sap)) == NNG_OK) {
-		*addrp = *sap;
-	}
-	return (rv);
+	*addrp = *(nni_http_self_addr(conn));
+	return (NNG_OK);
 }
 
 nng_err