From 6df40cb6eea9a4220d61c4c927ce5a857a12a338 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Tue, 20 Mar 2018 18:38:54 -0700
Subject: fixes #301 String option handling for getopt

---
 src/transport/tls/tls.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/transport/tls')

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[] = {
-- 
cgit v1.2.3-70-g09d2