More work on moving SP stuff out of common. Remove unused defs.

14 files changed, 67 insertions, 77 deletions

diff --git a/src/core/defs.h b/src/core/defs.h
index a313c248..f57db17a 100644
--- a/src/core/defs.h
+++ b/src/core/defs.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
 // Copyright 2018 Capitar IT Group BV <info@capitoar.com>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -36,8 +36,6 @@ typedef nng_sockaddr      nni_sockaddr;
 typedef nng_url           nni_url;
 typedef nng_iov           nni_iov;
 typedef nng_aio           nni_aio;
-typedef struct nng_event  nni_event;
-typedef struct nng_notify nni_notify;
 
 // These are our own names.
 typedef struct nni_socket   nni_sock;
@@ -46,10 +44,10 @@ typedef struct nni_dialer   nni_dialer;
 typedef struct nni_listener nni_listener;
 typedef struct nni_pipe     nni_pipe;
 
-typedef struct nni_tran              nni_tran;
-typedef struct nni_tran_dialer_ops   nni_tran_dialer_ops;
-typedef struct nni_tran_listener_ops nni_tran_listener_ops;
-typedef struct nni_tran_pipe_ops     nni_tran_pipe_ops;
+typedef struct nni_sp_tran           nni_sp_tran;
+typedef struct nni_sp_dialer_ops     nni_sp_dialer_ops;
+typedef struct nni_sp_listener_ops   nni_sp_listener_ops;
+typedef struct nni_sp_pipe_ops       nni_sp_pipe_ops;
 
 typedef struct nni_proto_ctx_ops  nni_proto_ctx_ops;
 typedef struct nni_proto_sock_ops nni_proto_sock_ops;
@@ -61,7 +59,6 @@ typedef struct nni_plat_cv  nni_cv;
 typedef struct nni_thr      nni_thr;
 typedef void (*nni_thr_func)(void *);
 
-typedef int      nni_signal;   // Wakeup channel.
 typedef uint64_t nni_time;     // Abs. time (ms).
 typedef int32_t  nni_duration; // Rel. time (ms).
 
diff --git a/src/core/dialer.c b/src/core/dialer.c
index 3044f2b8..83aefaaf 100644
--- a/src/core/dialer.c
+++ b/src/core/dialer.c
@@ -228,7 +228,7 @@ nni_dialer_bump_error(nni_dialer *d, int err)
 int
 nni_dialer_create(nni_dialer **dp, nni_sock *s, const char *urlstr)
 {
-	nni_tran *  tran;
+	nni_sp_tran *  tran;
 	nni_dialer *d;
 	int         rv;
 	nni_url *   url;
diff --git a/src/core/listener.c b/src/core/listener.c
index ebe1f416..9ed39a88 100644
--- a/src/core/listener.c
+++ b/src/core/listener.c
@@ -219,7 +219,7 @@ nni_listener_bump_error(nni_listener *l, int err)
 int
 nni_listener_create(nni_listener **lp, nni_sock *s, const char *url_str)
 {
-	nni_tran *    tran;
+	nni_sp_tran *    tran;
 	nni_listener *l;
 	int           rv;
 	nni_url *     url;
diff --git a/src/core/pipe.c b/src/core/pipe.c
index 47304fe7..91ff8a19 100644
--- a/src/core/pipe.c
+++ b/src/core/pipe.c
@@ -245,7 +245,7 @@ pipe_stats_init(nni_pipe *p)
 #endif // NNG_ENABLE_STATS
 
 static int
-pipe_create(nni_pipe **pp, nni_sock *sock, nni_tran *tran, void *tdata)
+pipe_create(nni_pipe **pp, nni_sock *sock, nni_sp_tran *tran, void *tdata)
 {
 	nni_pipe *          p;
 	int                 rv;
@@ -303,7 +303,7 @@ int
 nni_pipe_create_dialer(nni_pipe **pp, nni_dialer *d, void *tdata)
 {
 	int       rv;
-	nni_tran *tran = d->d_tran;
+	nni_sp_tran *tran = d->d_tran;
 	nni_pipe *p;
 
 	if ((rv = pipe_create(&p, d->d_sock, tran, tdata)) != 0) {
@@ -327,7 +327,7 @@ int
 nni_pipe_create_listener(nni_pipe **pp, nni_listener *l, void *tdata)
 {
 	int       rv;
-	nni_tran *tran = l->l_tran;
+	nni_sp_tran *tran = l->l_tran;
 	nni_pipe *p;
 
 	if ((rv = pipe_create(&p, l->l_sock, tran, tdata)) != 0) {
diff --git a/src/core/sockimpl.h b/src/core/sockimpl.h
index 638a3bfd..e9bf69fb 100644
--- a/src/core/sockimpl.h
+++ b/src/core/sockimpl.h
@@ -16,8 +16,8 @@
 // are subject to change at any time.
 
 struct nni_dialer {
-	nni_tran_dialer_ops d_ops;  // transport ops
-	nni_tran *          d_tran; // transport pointer
+	nni_sp_dialer_ops   d_ops;  // transport ops
+	nni_sp_tran *          d_tran; // transport pointer
 	void *              d_data; // transport private
 	uint32_t            d_id;   // endpoint id
 	nni_list_node       d_node; // per socket list
@@ -59,8 +59,8 @@ struct nni_dialer {
 };
 
 struct nni_listener {
-	nni_tran_listener_ops l_ops;  // transport ops
-	nni_tran *            l_tran; // transport pointer
+	nni_sp_listener_ops   l_ops;  // transport ops
+	nni_sp_tran *            l_tran; // transport pointer
 	void *                l_data; // transport private
 	uint32_t              l_id;   // endpoint id
 	nni_list_node         l_node; // per socket list
@@ -95,7 +95,7 @@ struct nni_listener {
 
 struct nni_pipe {
 	uint32_t           p_id;
-	nni_tran_pipe_ops  p_tran_ops;
+	nni_sp_pipe_ops    p_tran_ops;
 	nni_proto_pipe_ops p_proto_ops;
 	size_t             p_size;
 	void *             p_tran_data;
diff --git a/src/sp/transport.c b/src/sp/transport.c
index 78859078..2dce661c 100644
--- a/src/sp/transport.c
+++ b/src/sp/transport.c
@@ -35,11 +35,11 @@
 
 // For now the list of transports is hard-wired.  Adding new transports
 // to the system dynamically is something that might be considered later.
-extern nni_tran nni_tcp_tran;
-extern nni_tran nni_ipc_tran;
+extern nni_sp_tran nni_tcp_tran;
+extern nni_sp_tran nni_ipc_tran;
 
 typedef struct nni_transport {
-	nni_tran      t_tran;
+	nni_sp_tran   t_tran;
 	nni_list_node t_node;
 } nni_transport;
 
@@ -48,7 +48,7 @@ static nni_mtx  nni_tran_lk;
 static int      nni_tran_inited;
 
 int
-nni_tran_register(const nni_tran *tran)
+nni_tran_register(const nni_sp_tran *tran)
 {
 	nni_transport *t;
 	int            rv;
@@ -94,7 +94,7 @@ nni_tran_register(const nni_tran *tran)
 	return (0);
 }
 
-nni_tran *
+nni_sp_tran *
 nni_tran_find(nni_url *url)
 {
 	// address is of the form "<scheme>://blah..."
diff --git a/src/sp/transport.h b/src/sp/transport.h
index b2da2c7a..d28053b9 100644
--- a/src/sp/transport.h
+++ b/src/sp/transport.h
@@ -22,15 +22,8 @@
 // during the life of the project.  If we add a new version, please keep
 // the old version around -- it may be possible to automatically convert
 // older versions in the future.
-#define NNI_TRANSPORT_V0 0x54520000
-#define NNI_TRANSPORT_V1 0x54520001
-#define NNI_TRANSPORT_V2 0x54520002
-#define NNI_TRANSPORT_V3 0x54520003
-#define NNI_TRANSPORT_V4 0x54520004
-#define NNI_TRANSPORT_V5 0x54520005
-#define NNI_TRANSPORT_V6 0x54220006
-#define NNI_TRANSPORT_V7 0x54220006
-#define NNI_TRANSPORT_VERSION NNI_TRANSPORT_V7
+#define NNI_TRANSPORT_V8 0x54220008
+#define NNI_TRANSPORT_VERSION NNI_TRANSPORT_V8
 
 // Endpoint operations are called by the socket in a
 // protocol-independent fashion.  The socket makes individual calls,
@@ -42,7 +35,7 @@
 // point is run exclusively of the others. (Transports must still guard
 // against any asynchronous operations they manage themselves, though.)
 
-struct nni_tran_dialer_ops {
+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 **, nni_url *, nni_dialer *);
@@ -73,7 +66,7 @@ struct nni_tran_dialer_ops {
 	nni_option *d_options;
 };
 
-struct nni_tran_listener_ops {
+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 **, nni_url *, nni_listener *);
@@ -114,7 +107,7 @@ struct nni_tran_listener_ops {
 // to call back into the socket at this point.  (Which is one reason
 // pointers back to socket or even enclosing pipe state, are not
 // provided.)
-struct nni_tran_pipe_ops {
+struct nni_sp_pipe_ops {
 	// p_init initializes the pipe data structures.  The main
 	// purpose of this is so that the pipe will see the upper
 	// layer nni_pipe and get a chance to register stats and such.
@@ -159,7 +152,7 @@ struct nni_tran_pipe_ops {
 
 // Transport implementation details.  Transports must implement the
 // interfaces in this file.
-struct nni_tran {
+struct nni_sp_tran {
 	// tran_version is the version of the transport ops that this
 	// transport implements.  We only bother to version the main
 	// ops vector.
@@ -169,13 +162,13 @@ struct nni_tran {
 	const char *tran_scheme;
 
 	// tran_dialer links our dialer-specific operations.
-	const nni_tran_dialer_ops *tran_dialer;
+	const nni_sp_dialer_ops *tran_dialer;
 
 	// tran_listener links our listener-specific operations.
-	const nni_tran_listener_ops *tran_listener;
+	const nni_sp_listener_ops *tran_listener;
 
 	// tran_pipe links our pipe-specific operations.
-	const nni_tran_pipe_ops *tran_pipe;
+	const nni_sp_pipe_ops *tran_pipe;
 
 	// tran_init, if not NULL, is called once during library
 	// initialization.
@@ -188,9 +181,9 @@ struct nni_tran {
 
 // These APIs are used by the framework internally, and not for use by
 // transport implementations.
-extern nni_tran *nni_tran_find(nni_url *);
+extern nni_sp_tran *nni_tran_find(nni_url *);
 extern int       nni_tran_sys_init(void);
 extern void      nni_tran_sys_fini(void);
-extern int       nni_tran_register(const nni_tran *);
+extern int       nni_tran_register(const nni_sp_tran *);
 
 #endif // CORE_TRANSPORT_H
diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index 84e2c625..1a666922 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -611,7 +611,7 @@ inproc_pipe_getopt(
 	return (nni_getopt(inproc_pipe_options, name, arg, v, szp, t));
 }
 
-static nni_tran_pipe_ops inproc_pipe_ops = {
+static nni_sp_pipe_ops inproc_pipe_ops = {
 	.p_init   = inproc_pipe_init,
 	.p_fini   = inproc_pipe_fini,
 	.p_send   = inproc_pipe_send,
@@ -654,7 +654,7 @@ inproc_ep_setopt(
 	return (nni_setopt(inproc_ep_options, name, arg, v, sz, t));
 }
 
-static nni_tran_dialer_ops inproc_dialer_ops = {
+static nni_sp_dialer_ops inproc_dialer_ops = {
 	.d_init    = inproc_dialer_init,
 	.d_fini    = inproc_ep_fini,
 	.d_connect = inproc_ep_connect,
@@ -663,7 +663,7 @@ static nni_tran_dialer_ops inproc_dialer_ops = {
 	.d_setopt  = inproc_ep_setopt,
 };
 
-static nni_tran_listener_ops inproc_listener_ops = {
+static nni_sp_listener_ops inproc_listener_ops = {
 	.l_init   = inproc_listener_init,
 	.l_fini   = inproc_ep_fini,
 	.l_bind   = inproc_ep_bind,
@@ -675,7 +675,7 @@ static nni_tran_listener_ops inproc_listener_ops = {
 
 // This is the inproc transport linkage, and should be the only global
 // symbol in this entire file.
-struct nni_tran nni_inproc_tran = {
+struct nni_sp_tran nni_inproc_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "inproc",
 	.tran_dialer   = &inproc_dialer_ops,
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index efaa823c..d6b473ec 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -1021,7 +1021,7 @@ ipc_pipe_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
 	return (nni_stream_get(p->conn, name, buf, szp, t));
 }
 
-static nni_tran_pipe_ops ipc_tran_pipe_ops = {
+static nni_sp_pipe_ops ipc_tran_pipe_ops = {
 	.p_init   = ipc_pipe_init,
 	.p_fini   = ipc_pipe_fini,
 	.p_stop   = ipc_pipe_stop,
@@ -1099,7 +1099,7 @@ ipc_listener_set(
 	return (rv);
 }
 
-static nni_tran_dialer_ops ipc_dialer_ops = {
+static nni_sp_dialer_ops ipc_dialer_ops = {
 	.d_init    = ipc_ep_init_dialer,
 	.d_fini    = ipc_ep_fini,
 	.d_connect = ipc_ep_connect,
@@ -1108,7 +1108,7 @@ static nni_tran_dialer_ops ipc_dialer_ops = {
 	.d_setopt  = ipc_dialer_set,
 };
 
-static nni_tran_listener_ops ipc_listener_ops = {
+static nni_sp_listener_ops ipc_listener_ops = {
 	.l_init   = ipc_ep_init_listener,
 	.l_fini   = ipc_ep_fini,
 	.l_bind   = ipc_ep_bind,
@@ -1118,7 +1118,7 @@ static nni_tran_listener_ops ipc_listener_ops = {
 	.l_setopt = ipc_listener_set,
 };
 
-static nni_tran ipc_tran = {
+static nni_sp_tran ipc_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ipc",
 	.tran_dialer   = &ipc_dialer_ops,
@@ -1129,7 +1129,7 @@ static nni_tran ipc_tran = {
 };
 
 #ifdef NNG_PLATFORM_POSIX
-static nni_tran ipc_tran_unix = {
+static nni_sp_tran ipc_tran_unix = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "unix",
 	.tran_dialer   = &ipc_dialer_ops,
@@ -1141,7 +1141,7 @@ static nni_tran ipc_tran_unix = {
 #endif
 
 #ifdef NNG_HAVE_ABSTRACT_SOCKETS
-static nni_tran ipc_tran_abstract = {
+static nni_sp_tran ipc_tran_abstract = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "abstract",
 	.tran_dialer   = &ipc_dialer_ops,
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 8b7403b6..60208080 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -1119,7 +1119,7 @@ tcptran_ep_accept(void *arg, nni_aio *aio)
 	nni_mtx_unlock(&ep->mtx);
 }
 
-static nni_tran_pipe_ops tcptran_pipe_ops = {
+static nni_sp_pipe_ops tcptran_pipe_ops = {
 	.p_init   = tcptran_pipe_init,
 	.p_fini   = tcptran_pipe_fini,
 	.p_stop   = tcptran_pipe_stop,
@@ -1202,7 +1202,7 @@ tcptran_listener_setopt(
 	return (rv);
 }
 
-static nni_tran_dialer_ops tcptran_dialer_ops = {
+static nni_sp_dialer_ops tcptran_dialer_ops = {
 	.d_init    = tcptran_dialer_init,
 	.d_fini    = tcptran_ep_fini,
 	.d_connect = tcptran_ep_connect,
@@ -1211,7 +1211,7 @@ static nni_tran_dialer_ops tcptran_dialer_ops = {
 	.d_setopt  = tcptran_dialer_setopt,
 };
 
-static nni_tran_listener_ops tcptran_listener_ops = {
+static nni_sp_listener_ops tcptran_listener_ops = {
 	.l_init   = tcptran_listener_init,
 	.l_fini   = tcptran_ep_fini,
 	.l_bind   = tcptran_ep_bind,
@@ -1221,7 +1221,7 @@ static nni_tran_listener_ops tcptran_listener_ops = {
 	.l_setopt = tcptran_listener_setopt,
 };
 
-static nni_tran tcp_tran = {
+static nni_sp_tran tcp_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp",
 	.tran_dialer   = &tcptran_dialer_ops,
@@ -1231,7 +1231,7 @@ static nni_tran tcp_tran = {
 	.tran_fini     = tcptran_fini,
 };
 
-static nni_tran tcp4_tran = {
+static nni_sp_tran tcp4_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp4",
 	.tran_dialer   = &tcptran_dialer_ops,
@@ -1241,7 +1241,7 @@ static nni_tran tcp4_tran = {
 	.tran_fini     = tcptran_fini,
 };
 
-static nni_tran tcp6_tran = {
+static nni_sp_tran tcp6_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp6",
 	.tran_dialer   = &tcptran_dialer_ops,
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 44431e78..87df05b0 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -1146,7 +1146,7 @@ tlstran_pipe_getopt(
 	return (rv);
 }
 
-static nni_tran_pipe_ops tlstran_pipe_ops = {
+static nni_sp_pipe_ops tlstran_pipe_ops = {
 	.p_init   = tlstran_pipe_init,
 	.p_fini   = tlstran_pipe_fini,
 	.p_stop   = tlstran_pipe_stop,
@@ -1231,7 +1231,7 @@ tlstran_listener_set(
 	return (rv);
 }
 
-static nni_tran_dialer_ops tlstran_dialer_ops = {
+static nni_sp_dialer_ops tlstran_dialer_ops = {
 	.d_init    = tlstran_ep_init_dialer,
 	.d_fini    = tlstran_ep_fini,
 	.d_connect = tlstran_ep_connect,
@@ -1240,7 +1240,7 @@ static nni_tran_dialer_ops tlstran_dialer_ops = {
 	.d_setopt  = tlstran_dialer_setopt,
 };
 
-static nni_tran_listener_ops tlstran_listener_ops = {
+static nni_sp_listener_ops tlstran_listener_ops = {
 	.l_init   = tlstran_ep_init_listener,
 	.l_fini   = tlstran_ep_fini,
 	.l_bind   = tlstran_ep_bind,
@@ -1250,7 +1250,7 @@ static nni_tran_listener_ops tlstran_listener_ops = {
 	.l_setopt = tlstran_listener_set,
 };
 
-static nni_tran tls_tran = {
+static nni_sp_tran tls_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp",
 	.tran_dialer   = &tlstran_dialer_ops,
@@ -1260,7 +1260,7 @@ static nni_tran tls_tran = {
 	.tran_fini     = tlstran_fini,
 };
 
-static nni_tran tls4_tran = {
+static nni_sp_tran tls4_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp4",
 	.tran_dialer   = &tlstran_dialer_ops,
@@ -1270,7 +1270,7 @@ static nni_tran tls4_tran = {
 	.tran_fini     = tlstran_fini,
 };
 
-static nni_tran tls6_tran = {
+static nni_sp_tran tls6_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tls+tcp6",
 	.tran_dialer   = &tlstran_dialer_ops,
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index 3f73f47f..fcdd359f 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -354,7 +354,7 @@ wstran_pipe_getopt(
 	return (rv);
 }
 
-static nni_tran_pipe_ops ws_pipe_ops = {
+static nni_sp_pipe_ops ws_pipe_ops = {
 	.p_init   = wstran_pipe_init,
 	.p_fini   = wstran_pipe_fini,
 	.p_stop   = wstran_pipe_stop,
@@ -622,7 +622,7 @@ wstran_listener_set(
 	return (rv);
 }
 
-static nni_tran_dialer_ops ws_dialer_ops = {
+static nni_sp_dialer_ops ws_dialer_ops = {
 	.d_init    = wstran_dialer_init,
 	.d_fini    = wstran_dialer_fini,
 	.d_connect = wstran_dialer_connect,
@@ -631,7 +631,7 @@ static nni_tran_dialer_ops ws_dialer_ops = {
 	.d_getopt  = wstran_dialer_getopt,
 };
 
-static nni_tran_listener_ops ws_listener_ops = {
+static nni_sp_listener_ops ws_listener_ops = {
 	.l_init   = wstran_listener_init,
 	.l_fini   = wstran_listener_fini,
 	.l_bind   = ws_listener_bind,
@@ -641,7 +641,7 @@ static nni_tran_listener_ops ws_listener_ops = {
 	.l_getopt = wstran_listener_get,
 };
 
-static nni_tran ws_tran = {
+static nni_sp_tran ws_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws",
 	.tran_dialer   = &ws_dialer_ops,
@@ -651,7 +651,7 @@ static nni_tran ws_tran = {
 	.tran_fini     = wstran_fini,
 };
 
-static nni_tran ws4_tran = {
+static nni_sp_tran ws4_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws4",
 	.tran_dialer   = &ws_dialer_ops,
@@ -661,7 +661,7 @@ static nni_tran ws4_tran = {
 	.tran_fini     = wstran_fini,
 };
 
-static nni_tran ws6_tran = {
+static nni_sp_tran ws6_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "ws6",
 	.tran_dialer   = &ws_dialer_ops,
@@ -686,7 +686,7 @@ nng_ws_register(void)
 
 #ifdef NNG_TRANSPORT_WSS
 
-static nni_tran wss_tran = {
+static nni_sp_tran wss_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss",
 	.tran_dialer   = &ws_dialer_ops,
@@ -696,7 +696,7 @@ static nni_tran wss_tran = {
 	.tran_fini     = wstran_fini,
 };
 
-static nni_tran wss4_tran = {
+static nni_sp_tran wss4_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss4",
 	.tran_dialer   = &ws_dialer_ops,
@@ -706,7 +706,7 @@ static nni_tran wss4_tran = {
 	.tran_fini     = wstran_fini,
 };
 
-static nni_tran wss6_tran = {
+static nni_sp_tran wss6_tran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "wss6",
 	.tran_dialer   = &ws_dialer_ops,
diff --git a/tests/transport.c b/tests/transport.c
index 850fe1a7..8ec52c66 100644
--- a/tests/transport.c
+++ b/tests/transport.c
@@ -40,7 +40,7 @@ finish(void)
 }
 
 // Fake TCP transport
-struct nni_tran fake_tcp = {
+struct nni_sp_tran fake_tcp = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "tcp",
 	.tran_dialer   = NULL,
@@ -51,7 +51,7 @@ struct nni_tran fake_tcp = {
 };
 
 // Bad version transport
-struct nni_tran badvers = {
+struct nni_sp_tran badvers = {
 	.tran_version  = NNI_TRANSPORT_VERSION + 1,
 	.tran_scheme   = "badvers",
 	.tran_dialer   = NULL,
@@ -61,7 +61,7 @@ struct nni_tran badvers = {
 	.tran_fini     = finish,
 };
 
-struct nni_tran badtran = {
+struct nni_sp_tran badtran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "badtran",
 	.tran_dialer   = NULL,
@@ -72,7 +72,7 @@ struct nni_tran badtran = {
 };
 
 // Bogus good transport
-struct nni_tran goodtran = {
+struct nni_sp_tran goodtran = {
 	.tran_version  = NNI_TRANSPORT_VERSION,
 	.tran_scheme   = "goodtran",
 	.tran_dialer   = NULL,
diff --git a/tests/trantest.h b/tests/trantest.h
index ad493fdb..f16443ce 100644
--- a/tests/trantest.h
+++ b/tests/trantest.h
@@ -32,7 +32,7 @@ struct trantest {
 	char        addr[NNG_MAXADDRLEN + 1];
 	nng_socket  reqsock;
 	nng_socket  repsock;
-	nni_tran *  tran;
+	nni_sp_tran *  tran;
 	int (*init)(struct trantest *);
 	void (*fini)(struct trantest *);
 	int (*dialer_init)(nng_dialer);