fixes #301 String option handling for getopt

6 files changed, 90 insertions, 88 deletions

diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c
index 14457623..e7253f7b 100644
--- a/src/transport/inproc/inproc.c
+++ b/src/transport/inproc/inproc.c
@@ -177,7 +177,7 @@ nni_inproc_pipe_peer(void *arg)
 }
 
 static int
-nni_inproc_pipe_get_addr(void *arg, void *buf, size_t *szp)
+nni_inproc_pipe_get_addr(void *arg, void *buf, size_t *szp, int typ)
 {
 	nni_inproc_pipe *p = arg;
 	nni_sockaddr     sa;
@@ -185,7 +185,7 @@ nni_inproc_pipe_get_addr(void *arg, void *buf, size_t *szp)
 	memset(&sa, 0, sizeof(sa));
 	sa.s_inproc.sa_family = NNG_AF_INPROC;
 	nni_strlcpy(sa.s_inproc.sa_name, p->addr, sizeof(sa.s_inproc.sa_name));
-	return (nni_getopt_sockaddr(&sa, buf, szp));
+	return (nni_copyout_sockaddr(&sa, buf, szp, typ));
 }
 
 static int
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c
index 9f95c2a9..9d25ed72 100644
--- a/src/transport/ipc/ipc.c
+++ b/src/transport/ipc/ipc.c
@@ -490,10 +490,10 @@ nni_ipc_pipe_peer(void *arg)
 }
 
 static int
-nni_ipc_pipe_get_addr(void *arg, void *buf, size_t *szp)
+nni_ipc_pipe_get_addr(void *arg, void *buf, size_t *szp, int typ)
 {
 	nni_ipc_pipe *p = arg;
-	return (nni_getopt_sockaddr(&p->sa, buf, szp));
+	return (nni_copyout_sockaddr(&p->sa, buf, szp, typ));
 }
 
 static void
@@ -689,17 +689,17 @@ nni_ipc_ep_setopt_recvmaxsz(void *arg, const void *data, size_t sz)
 }
 
 static int
-nni_ipc_ep_getopt_recvmaxsz(void *arg, void *data, size_t *szp)
+nni_ipc_ep_getopt_recvmaxsz(void *arg, void *data, size_t *szp, int typ)
 {
 	nni_ipc_ep *ep = arg;
-	return (nni_getopt_size(ep->rcvmax, data, szp));
+	return (nni_copyout_size(ep->rcvmax, data, szp, typ));
 }
 
 static int
-nni_ipc_ep_get_addr(void *arg, void *data, size_t *szp)
+nni_ipc_ep_get_addr(void *arg, void *data, size_t *szp, int typ)
 {
 	nni_ipc_ep *ep = arg;
-	return (nni_getopt_sockaddr(&ep->sa, data, szp));
+	return (nni_copyout_sockaddr(&ep->sa, data, szp, typ));
 }
 
 static nni_tran_pipe_option nni_ipc_pipe_options[] = {
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index 5741beea..4837c8d3 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -442,7 +442,7 @@ nni_tcp_pipe_peer(void *arg)
 }
 
 static int
-nni_tcp_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
+nni_tcp_pipe_getopt_locaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tcp_pipe *p = arg;
 	int           rv;
@@ -450,13 +450,13 @@ nni_tcp_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_plat_tcp_pipe_sockname(p->tpp, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
 
 static int
-nni_tcp_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
+nni_tcp_pipe_getopt_remaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tcp_pipe *p = arg;
 	int           rv;
@@ -464,7 +464,7 @@ nni_tcp_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_plat_tcp_pipe_peername(p->tpp, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
@@ -736,7 +736,7 @@ nni_tcp_ep_setopt_recvmaxsz(void *arg, const void *v, size_t sz)
 }
 
 static int
-nni_tcp_ep_getopt_url(void *arg, void *v, size_t *szp)
+nni_tcp_ep_getopt_url(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tcp_ep *ep = arg;
 	char        ustr[128];
@@ -744,18 +744,18 @@ nni_tcp_ep_getopt_url(void *arg, void *v, size_t *szp)
 	char        portstr[6]; // max for 16-bit port
 
 	if (ep->mode == NNI_EP_MODE_DIAL) {
-		return (nni_getopt_str(ep->url->u_rawurl, v, szp));
+		return (nni_copyout_str(ep->url->u_rawurl, v, szp, typ));
 	}
 	nni_plat_tcp_ntop(&ep->bsa, ipstr, portstr);
 	snprintf(ustr, sizeof(ustr), "tcp://%s:%s", ipstr, portstr);
-	return (nni_getopt_str(ustr, v, szp));
+	return (nni_copyout_str(ustr, v, szp, typ));
 }
 
 static int
-nni_tcp_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp)
+nni_tcp_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tcp_ep *ep = arg;
-	return (nni_getopt_size(ep->rcvmax, v, szp));
+	return (nni_copyout_size(ep->rcvmax, v, szp, typ));
 }
 
 static int
@@ -769,10 +769,10 @@ nni_tcp_ep_setopt_linger(void *arg, const void *v, size_t sz)
 }
 
 static int
-nni_tcp_ep_getopt_linger(void *arg, void *v, size_t *szp)
+nni_tcp_ep_getopt_linger(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tcp_ep *ep = arg;
-	return (nni_getopt_ms(ep->linger, v, szp));
+	return (nni_copyout_ms(ep->linger, v, szp, typ));
 }
 
 static nni_tran_pipe_option nni_tcp_pipe_options[] = {
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index 9299ba2d..84125c48 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -453,7 +453,7 @@ nni_tls_pipe_peer(void *arg)
 }
 
 static int
-nni_tls_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
+nni_tls_pipe_getopt_locaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_pipe *p = arg;
 	int           rv;
@@ -461,13 +461,13 @@ nni_tls_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_tls_sockname(p->tls, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
 
 static int
-nni_tls_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
+nni_tls_pipe_getopt_remaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_pipe *p = arg;
 	int           rv;
@@ -475,7 +475,7 @@ nni_tls_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_tls_peername(p->tls, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
@@ -749,7 +749,7 @@ nni_tls_ep_connect(void *arg, nni_aio *aio)
 }
 
 static int
-nni_tls_ep_getopt_url(void *arg, void *v, size_t *szp)
+nni_tls_ep_getopt_url(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_ep *ep = arg;
 	char        ustr[128];
@@ -757,11 +757,11 @@ nni_tls_ep_getopt_url(void *arg, void *v, size_t *szp)
 	char        portstr[6]; // max for 16-bit port
 
 	if (ep->mode == NNI_EP_MODE_DIAL) {
-		return (nni_getopt_str(ep->url->u_rawurl, v, szp));
+		return (nni_copyout_str(ep->url->u_rawurl, v, szp, typ));
 	}
 	nni_plat_tcp_ntop(&ep->bsa, ipstr, portstr);
 	snprintf(ustr, sizeof(ustr), "tls+tcp://%s:%s", ipstr, portstr);
-	return (nni_getopt_str(ustr, v, szp));
+	return (nni_copyout_str(ustr, v, szp, typ));
 }
 
 static int
@@ -775,10 +775,10 @@ nni_tls_ep_setopt_recvmaxsz(void *arg, const void *v, size_t sz)
 }
 
 static int
-nni_tls_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp)
+nni_tls_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_ep *ep = arg;
-	return (nni_getopt_size(ep->rcvmax, v, szp));
+	return (nni_copyout_size(ep->rcvmax, v, szp, typ));
 }
 
 static int
@@ -792,10 +792,10 @@ nni_tls_ep_setopt_linger(void *arg, const void *v, size_t sz)
 }
 
 static int
-nni_tls_ep_getopt_linger(void *arg, void *v, size_t *szp)
+nni_tls_ep_getopt_linger(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_ep *ep = arg;
-	return (nni_getopt_ms(ep->linger, v, szp));
+	return (nni_copyout_ms(ep->linger, v, szp, typ));
 }
 
 static int
@@ -824,10 +824,10 @@ tls_setopt_config(void *arg, const void *data, size_t sz)
 }
 
 static int
-tls_getopt_config(void *arg, void *v, size_t *szp)
+tls_getopt_config(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_ep *ep = arg;
-	return (nni_getopt_ptr(ep->cfg, v, szp));
+	return (nni_copyout_ptr(ep->cfg, v, szp, typ));
 }
 
 static int
@@ -888,11 +888,11 @@ tls_setopt_cert_key_file(void *arg, const void *v, size_t sz)
 }
 
 static int
-tls_getopt_verified(void *arg, void *v, size_t *szp)
+tls_getopt_verified(void *arg, void *v, size_t *szp, int typ)
 {
 	nni_tls_pipe *p = arg;
 
-	return (nni_getopt_bool(nni_tls_verified(p->tls), v, szp));
+	return (nni_copyout_bool(nni_tls_verified(p->tls), v, szp, typ));
 }
 
 static nni_tran_pipe_option nni_tls_pipe_options[] = {
diff --git a/src/transport/ws/websocket.c b/src/transport/ws/websocket.c
index 1b862d73..1a83462a 100644
--- a/src/transport/ws/websocket.c
+++ b/src/transport/ws/websocket.c
@@ -470,14 +470,14 @@ ws_ep_setopt_reshdrs(void *arg, const void *v, size_t sz)
 }
 
 static int
-ws_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp)
+ws_ep_getopt_recvmaxsz(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_ep *ep = arg;
-	return (nni_getopt_size(ep->rcvmax, v, szp));
+	return (nni_copyout_size(ep->rcvmax, v, szp, typ));
 }
 
 static int
-ws_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
+ws_pipe_getopt_locaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_pipe *    p = arg;
 	int          rv;
@@ -485,13 +485,13 @@ ws_pipe_getopt_locaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_ws_sock_addr(p->ws, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
 
 static int
-ws_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
+ws_pipe_getopt_remaddr(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_pipe *    p = arg;
 	int          rv;
@@ -499,13 +499,13 @@ ws_pipe_getopt_remaddr(void *arg, void *v, size_t *szp)
 
 	memset(&sa, 0, sizeof(sa));
 	if ((rv = nni_ws_peer_addr(p->ws, &sa)) == 0) {
-		rv = nni_getopt_sockaddr(&sa, v, szp);
+		rv = nni_copyout_sockaddr(&sa, v, szp, typ);
 	}
 	return (rv);
 }
 
 static int
-ws_pipe_getopt_reshdrs(void *arg, void *v, size_t *szp)
+ws_pipe_getopt_reshdrs(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_pipe *   p = arg;
 	const char *s;
@@ -513,11 +513,11 @@ ws_pipe_getopt_reshdrs(void *arg, void *v, size_t *szp)
 	if ((s = nni_ws_response_headers(p->ws)) == NULL) {
 		return (NNG_ENOMEM);
 	}
-	return (nni_getopt_str(s, v, szp));
+	return (nni_copyout_str(s, v, szp, typ));
 }
 
 static int
-ws_pipe_getopt_reqhdrs(void *arg, void *v, size_t *szp)
+ws_pipe_getopt_reqhdrs(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_pipe *   p = arg;
 	const char *s;
@@ -525,14 +525,14 @@ ws_pipe_getopt_reqhdrs(void *arg, void *v, size_t *szp)
 	if ((s = nni_ws_request_headers(p->ws)) == NULL) {
 		return (NNG_ENOMEM);
 	}
-	return (nni_getopt_str(s, v, szp));
+	return (nni_copyout_str(s, v, szp, typ));
 }
 
 static int
-ws_pipe_getopt_tls_verified(void *arg, void *v, size_t *szp)
+ws_pipe_getopt_tls_verified(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_pipe *p = arg;
-	return (nni_getopt_bool(nni_ws_tls_verified(p->ws), v, szp));
+	return (nni_copyout_bool(nni_ws_tls_verified(p->ws), v, szp, typ));
 }
 
 static nni_tran_pipe_option ws_pipe_options[] = {
@@ -815,14 +815,14 @@ wss_get_tls(ws_ep *ep, nng_tls_config **tlsp)
 }
 
 static int
-wss_ep_getopt_tlsconfig(void *arg, void *v, size_t *szp)
+wss_ep_getopt_tlsconfig(void *arg, void *v, size_t *szp, int typ)
 {
 	ws_ep *         ep = arg;
 	nng_tls_config *tls;
 	int             rv;
 
 	if (((rv = wss_get_tls(ep, &tls)) != 0) ||
-	    ((rv = nni_getopt_ptr(tls, v, szp)) != 0)) {
+	    ((rv = nni_copyout_ptr(tls, v, szp, typ)) != 0)) {
 		return (rv);
 	}
 	return (0);
diff --git a/src/transport/zerotier/zerotier.c b/src/transport/zerotier/zerotier.c
index 98dbe2bd..da22dc54 100644
--- a/src/transport/zerotier/zerotier.c
+++ b/src/transport/zerotier/zerotier.c
@@ -1927,7 +1927,8 @@ zt_pipe_peer(void *arg)
 }
 
 static int
-zt_getopt_network_status(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp)
+zt_getopt_nw_status(
+    zt_node *ztn, uint64_t nwid, void *buf, size_t *szp, int typ)
 {
 	ZT_VirtualNetworkConfig *vcfg;
 	int                      status;
@@ -1964,11 +1965,11 @@ zt_getopt_network_status(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp)
 	ZT_Node_freeQueryResult(ztn->zn_znode, vcfg);
 	nni_mtx_unlock(&zt_lk);
 
-	return (nni_getopt_int(status, buf, szp));
+	return (nni_copyout_int(status, buf, szp, typ));
 }
 
 static int
-zt_getopt_network_name(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp)
+zt_getopt_nw_name(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp, int typ)
 {
 	ZT_VirtualNetworkConfig *vcfg;
 	int                      rv;
@@ -1979,7 +1980,8 @@ zt_getopt_network_name(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp)
 		nni_mtx_unlock(&zt_lk);
 		return (NNG_ECLOSED);
 	}
-	rv = nni_getopt_str(vcfg->name, buf, szp);
+
+	rv = nni_copyout_str(vcfg->name, buf, szp, typ);
 	ZT_Node_freeQueryResult(ztn->zn_znode, vcfg);
 	nni_mtx_unlock(&zt_lk);
 
@@ -1987,24 +1989,24 @@ zt_getopt_network_name(zt_node *ztn, uint64_t nwid, void *buf, size_t *szp)
 }
 
 static int
-zt_pipe_get_recvmaxsz(void *arg, void *buf, size_t *szp)
+zt_pipe_get_recvmaxsz(void *arg, void *buf, size_t *szp, int typ)
 {
 	zt_pipe *p = arg;
-	return (nni_getopt_size(p->zp_rcvmax, buf, szp));
+	return (nni_copyout_size(p->zp_rcvmax, buf, szp, typ));
 }
 
 static int
-zt_pipe_get_nwid(void *arg, void *buf, size_t *szp)
+zt_pipe_get_nwid(void *arg, void *buf, size_t *szp, int typ)
 {
 	zt_pipe *p = arg;
-	return (nni_getopt_u64(p->zp_nwid, buf, szp));
+	return (nni_copyout_u64(p->zp_nwid, buf, szp, typ));
 }
 
 static int
-zt_pipe_get_node(void *arg, void *buf, size_t *szp)
+zt_pipe_get_node(void *arg, void *buf, size_t *szp, int typ)
 {
 	zt_pipe *p = arg;
-	return (nni_getopt_u64(p->zp_laddr >> 24, buf, szp));
+	return (nni_copyout_u64(p->zp_laddr >> 24, buf, szp, typ));
 }
 
 static void
@@ -2545,10 +2547,10 @@ zt_ep_setopt_recvmaxsz(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_recvmaxsz(void *arg, void *data, size_t *szp)
+zt_ep_getopt_recvmaxsz(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_size(ep->ze_rcvmax, data, szp));
+	return (nni_copyout_size(ep->ze_rcvmax, data, szp, typ));
 }
 
 static int
@@ -2579,14 +2581,14 @@ zt_ep_setopt_home(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_home(void *arg, void *data, size_t *szp)
+zt_ep_getopt_home(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_str(ep->ze_home, data, szp));
+	return (nni_copyout_str(ep->ze_home, data, szp, typ));
 }
 
 static int
-zt_ep_getopt_url(void *arg, void *data, size_t *szp)
+zt_ep_getopt_url(void *arg, void *data, size_t *szp, int typ)
 {
 	char     ustr[64]; // more than plenty
 	zt_ep *  ep = arg;
@@ -2597,7 +2599,7 @@ zt_ep_getopt_url(void *arg, void *data, size_t *szp)
 	    (unsigned long long) addr >> zt_port_shift,
 	    (unsigned long long) ep->ze_nwid,
 	    (unsigned) (addr & zt_port_mask));
-	return (nni_getopt_str(ustr, data, szp));
+	return (nni_copyout_str(ustr, data, szp, typ));
 }
 
 static int
@@ -2645,31 +2647,31 @@ zt_ep_setopt_deorbit(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_node(void *arg, void *data, size_t *szp)
+zt_ep_getopt_node(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_u64(ep->ze_ztn->zn_self, data, szp));
+	return (nni_copyout_u64(ep->ze_ztn->zn_self, data, szp, typ));
 }
 
 static int
-zt_ep_getopt_nwid(void *arg, void *data, size_t *szp)
+zt_ep_getopt_nwid(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_u64(ep->ze_nwid, data, szp));
+	return (nni_copyout_u64(ep->ze_nwid, data, szp, typ));
 }
 
 static int
-zt_ep_getopt_network_name(void *arg, void *buf, size_t *szp)
+zt_ep_getopt_nw_name(void *arg, void *buf, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (zt_getopt_network_name(ep->ze_ztn, ep->ze_nwid, buf, szp));
+	return (zt_getopt_nw_name(ep->ze_ztn, ep->ze_nwid, buf, szp, typ));
 }
 
 static int
-zt_ep_getopt_network_status(void *arg, void *buf, size_t *szp)
+zt_ep_getopt_nw_status(void *arg, void *buf, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (zt_getopt_network_status(ep->ze_ztn, ep->ze_nwid, buf, szp));
+	return (zt_getopt_nw_status(ep->ze_ztn, ep->ze_nwid, buf, szp, typ));
 }
 
 static int
@@ -2683,10 +2685,10 @@ zt_ep_setopt_ping_time(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_ping_time(void *arg, void *data, size_t *szp)
+zt_ep_getopt_ping_time(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_ms(ep->ze_ping_time, data, szp));
+	return (nni_copyout_ms(ep->ze_ping_time, data, szp, typ));
 }
 
 static int
@@ -2700,10 +2702,10 @@ zt_ep_setopt_ping_tries(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_ping_tries(void *arg, void *data, size_t *szp)
+zt_ep_getopt_ping_tries(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_int(ep->ze_ping_tries, data, szp));
+	return (nni_copyout_int(ep->ze_ping_tries, data, szp, typ));
 }
 
 static int
@@ -2717,10 +2719,10 @@ zt_ep_setopt_conn_time(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_conn_time(void *arg, void *data, size_t *szp)
+zt_ep_getopt_conn_time(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_ms(ep->ze_conn_time, data, szp));
+	return (nni_copyout_ms(ep->ze_conn_time, data, szp, typ));
 }
 
 static int
@@ -2734,14 +2736,14 @@ zt_ep_setopt_conn_tries(void *arg, const void *data, size_t sz)
 }
 
 static int
-zt_ep_getopt_conn_tries(void *arg, void *data, size_t *szp)
+zt_ep_getopt_conn_tries(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_ep *ep = arg;
-	return (nni_getopt_int(ep->ze_conn_tries, data, szp));
+	return (nni_copyout_int(ep->ze_conn_tries, data, szp, typ));
 }
 
 static int
-zt_pipe_getopt_locaddr(void *arg, void *data, size_t *szp)
+zt_pipe_getopt_locaddr(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_pipe *    p = arg;
 	nng_sockaddr sa;
@@ -2751,11 +2753,11 @@ zt_pipe_getopt_locaddr(void *arg, void *data, size_t *szp)
 	sa.s_zt.sa_nwid   = p->zp_nwid;
 	sa.s_zt.sa_nodeid = p->zp_laddr >> zt_port_shift;
 	sa.s_zt.sa_port   = p->zp_laddr & zt_port_mask;
-	return (nni_getopt_sockaddr(&sa, data, szp));
+	return (nni_copyout_sockaddr(&sa, data, szp, typ));
 }
 
 static int
-zt_pipe_getopt_remaddr(void *arg, void *data, size_t *szp)
+zt_pipe_getopt_remaddr(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_pipe *    p = arg;
 	nng_sockaddr sa;
@@ -2765,14 +2767,14 @@ zt_pipe_getopt_remaddr(void *arg, void *data, size_t *szp)
 	sa.s_zt.sa_nwid   = p->zp_nwid;
 	sa.s_zt.sa_nodeid = p->zp_raddr >> zt_port_shift;
 	sa.s_zt.sa_port   = p->zp_raddr & zt_port_mask;
-	return (nni_getopt_sockaddr(&sa, data, szp));
+	return (nni_copyout_sockaddr(&sa, data, szp, typ));
 }
 
 static int
-zt_pipe_getopt_mtu(void *arg, void *data, size_t *szp)
+zt_pipe_getopt_mtu(void *arg, void *data, size_t *szp, int typ)
 {
 	zt_pipe *p = arg;
-	return (nni_getopt_size(p->zp_mtu, data, szp));
+	return (nni_copyout_size(p->zp_mtu, data, szp, typ));
 }
 
 static nni_tran_pipe_option zt_pipe_options[] = {
@@ -2856,13 +2858,13 @@ static nni_tran_ep_option zt_ep_options[] = {
 	{
 	    .eo_name   = NNG_OPT_ZT_NETWORK_STATUS,
 	    .eo_type   = NNI_TYPE_INT32, // enumeration really
-	    .eo_getopt = zt_ep_getopt_network_status,
+	    .eo_getopt = zt_ep_getopt_nw_status,
 	    .eo_setopt = NULL,
 	},
 	{
 	    .eo_name   = NNG_OPT_ZT_NETWORK_NAME,
 	    .eo_type   = NNI_TYPE_STRING,
-	    .eo_getopt = zt_ep_getopt_network_name,
+	    .eo_getopt = zt_ep_getopt_nw_name,
 	    .eo_setopt = NULL,
 	},
 	{