transports: all transports use the new inline approach

We can retire the old approach that used separate allocations,
and all of the supporting code.  This also gives us a more
natural signature for the end point initializations.

9 files changed, 31 insertions, 28 deletions

diff --git a/src/sp/transport.c b/src/sp/transport.c
index 178cc748..6d515967 100644
--- a/src/sp/transport.c
+++ b/src/sp/transport.c
@@ -22,6 +22,7 @@ void
 nni_sp_tran_register(nni_sp_tran *tran)
 {
 #ifndef NDEBUG
+	NNI_ASSERT(tran->tran_pipe->p_size != 0);
 	NNI_ASSERT(tran->tran_pipe->p_init != NULL);
 	NNI_ASSERT(tran->tran_pipe->p_fini != NULL);
 	NNI_ASSERT(tran->tran_pipe->p_stop != NULL);
@@ -31,6 +32,7 @@ nni_sp_tran_register(nni_sp_tran *tran)
 	NNI_ASSERT(tran->tran_pipe->p_peer != NULL);
 
 	if (tran->tran_dialer != NULL) {
+		NNI_ASSERT(tran->tran_dialer->d_size != 0);
 		NNI_ASSERT(tran->tran_dialer->d_init != NULL);
 		NNI_ASSERT(tran->tran_dialer->d_fini != NULL);
 		NNI_ASSERT(tran->tran_dialer->d_close != NULL);
@@ -41,6 +43,7 @@ nni_sp_tran_register(nni_sp_tran *tran)
 	}
 
 	if (tran->tran_listener != NULL) {
+		NNI_ASSERT(tran->tran_listener->l_size != 0);
 		NNI_ASSERT(tran->tran_listener->l_init != NULL);
 		NNI_ASSERT(tran->tran_listener->l_fini != NULL);
 		NNI_ASSERT(tran->tran_listener->l_bind != NULL);
diff --git a/src/sp/transport.h b/src/sp/transport.h
index 6d1e0d4a..28f1535b 100644
--- a/src/sp/transport.h
+++ b/src/sp/transport.h
@@ -32,7 +32,7 @@ struct nni_sp_dialer_ops {
 
 	// d_init creates a vanilla dialer. The value created is
 	// used for the first argument for all other dialer functions.
-	int (*d_init)(void **, nng_url *, nni_dialer *);
+	int (*d_init)(void *, nng_url *, nni_dialer *);
 
 	// d_fini frees the resources associated with the dialer.
 	// The dialer will already have been closed.
@@ -78,7 +78,7 @@ struct nni_sp_listener_ops {
 
 	// l_init creates a vanilla listener. The value created is
 	// used for the first argument for all other listener functions.
-	int (*l_init)(void **, nng_url *, nni_listener *);
+	int (*l_init)(void *, nng_url *, nni_listener *);
 
 	// l_fini frees the resources associated with the listener.
 	// The listener will already have been closed.
diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index 1dec45e3..90317499 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -283,9 +283,9 @@ inproc_ep_init(inproc_ep *ep, nni_sock *sock, const nng_url *url)
 }
 
 static int
-inproc_dialer_init(void **epp, nng_url *url, nni_dialer *ndialer)
+inproc_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 {
-	inproc_ep *ep = (void *) epp;
+	inproc_ep *ep = arg;
 
 	ep->dialer = ndialer;
 	inproc_ep_init(ep, nni_dialer_sock(ndialer), url);
@@ -293,9 +293,9 @@ inproc_dialer_init(void **epp, nng_url *url, nni_dialer *ndialer)
 }
 
 static int
-inproc_listener_init(void **epp, nng_url *url, nni_listener *nlistener)
+inproc_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
 {
-	inproc_ep *ep = (void *) epp;
+	inproc_ep *ep = arg;
 
 	ep->listener = nlistener;
 	inproc_ep_init(ep, nni_listener_sock(nlistener), url);
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index 4a1ce0d2..68f148f8 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -803,9 +803,9 @@ ipc_ep_init(ipc_ep *ep, nni_sock *sock, void (*conn_cb)(void *))
 }
 
 static int
-ipc_ep_init_dialer(void **dp, nng_url *url, nni_dialer *dialer)
+ipc_ep_init_dialer(void *arg, nng_url *url, nni_dialer *dialer)
 {
-	ipc_ep   *ep = (void *) dp;
+	ipc_ep   *ep = arg;
 	int       rv;
 	nni_sock *sock = nni_dialer_sock(dialer);
 
@@ -822,9 +822,9 @@ ipc_ep_init_dialer(void **dp, nng_url *url, nni_dialer *dialer)
 }
 
 static int
-ipc_ep_init_listener(void **dp, nng_url *url, nni_listener *listener)
+ipc_ep_init_listener(void *arg, nng_url *url, nni_listener *listener)
 {
-	ipc_ep   *ep = (void *) dp;
+	ipc_ep   *ep = arg;
 	int       rv;
 	nni_sock *sock = nni_listener_sock(listener);
 
diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c
index d066f837..646151ed 100644
--- a/src/sp/transport/socket/sockfd.c
+++ b/src/sp/transport/socket/sockfd.c
@@ -694,9 +694,9 @@ error:
 }
 
 static int
-sfd_tran_listener_init(void **lp, nng_url *url, nni_listener *nlistener)
+sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
 {
-	sfd_tran_ep *ep = (void *) lp;
+	sfd_tran_ep *ep = arg;
 	int          rv;
 	nni_sock    *sock = nni_listener_sock(nlistener);
 
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 730834da..4c0f76bd 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -793,9 +793,9 @@ tcptran_ep_init(tcptran_ep *ep, nni_sock *sock, void (*conn_cb)(void *))
 }
 
 static int
-tcptran_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
+tcptran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 {
-	tcptran_ep *ep = (void *) dp;
+	tcptran_ep *ep = arg;
 	int         rv;
 	nni_sock   *sock = nni_dialer_sock(ndialer);
 
@@ -823,9 +823,9 @@ tcptran_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
 }
 
 static int
-tcptran_listener_init(void **lp, nng_url *url, nni_listener *nlistener)
+tcptran_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
 {
-	tcptran_ep *ep = (void *) lp;
+	tcptran_ep *ep = arg;
 	int         rv;
 	nni_sock   *sock = nni_listener_sock(nlistener);
 
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 37092e17..2f21919d 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -766,9 +766,9 @@ tlstran_ep_init(tlstran_ep *ep, nni_sock *sock, nni_cb conn_cb)
 }
 
 static int
-tlstran_ep_init_dialer(void **dp, nng_url *url, nni_dialer *ndialer)
+tlstran_ep_init_dialer(void *arg, nng_url *url, nni_dialer *ndialer)
 {
-	tlstran_ep *ep = (void *) dp;
+	tlstran_ep *ep = arg;
 	int         rv;
 	nni_sock   *sock = nni_dialer_sock(ndialer);
 
@@ -795,9 +795,9 @@ tlstran_ep_init_dialer(void **dp, nng_url *url, nni_dialer *ndialer)
 }
 
 static int
-tlstran_ep_init_listener(void **lp, nng_url *url, nni_listener *nlistener)
+tlstran_ep_init_listener(void *arg, nng_url *url, nni_listener *nlistener)
 {
-	tlstran_ep *ep = (void *) lp;
+	tlstran_ep *ep = arg;
 	int         rv;
 	nni_sock   *sock = nni_listener_sock(nlistener);
 
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index 9f79a66f..6c0df5c4 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -1387,9 +1387,9 @@ udp_check_url(nng_url *url, bool listen)
 }
 
 static int
-udp_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
+udp_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 {
-	udp_ep   *ep = (void *) dp;
+	udp_ep   *ep = arg;
 	int       rv;
 	nni_sock *sock = nni_dialer_sock(ndialer);
 
@@ -1406,9 +1406,9 @@ udp_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
 }
 
 static int
-udp_listener_init(void **lp, nng_url *url, nni_listener *nlistener)
+udp_listener_init(void *arg, nng_url *url, nni_listener *nlistener)
 {
-	udp_ep   *ep = (void *) lp;
+	udp_ep   *ep = arg;
 	int       rv;
 	nni_sock *sock = nni_listener_sock(nlistener);
 
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index 276a8b16..33388fc9 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -520,9 +520,9 @@ error:
 }
 
 static int
-wstran_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
+wstran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer)
 {
-	ws_dialer *d = (void *) dp;
+	ws_dialer *d = arg;
 	nni_sock  *s = nni_dialer_sock(ndialer);
 	int        rv;
 	char       name[64];
@@ -550,9 +550,9 @@ wstran_dialer_init(void **dp, nng_url *url, nni_dialer *ndialer)
 }
 
 static int
-wstran_listener_init(void **lp, nng_url *url, nni_listener *listener)
+wstran_listener_init(void *arg, nng_url *url, nni_listener *listener)
 {
-	ws_listener *l = (void *) lp;
+	ws_listener *l = arg;
 	int          rv;
 	nni_sock    *s = nni_listener_sock(listener);
 	char         name[64];