Rename legacy connect/accept as _sync for now.

5 files changed, 40 insertions, 40 deletions

diff --git a/src/core/endpt.c b/src/core/endpt.c
index 223d86a3..b24d7643 100644
--- a/src/core/endpt.c
+++ b/src/core/endpt.c
@@ -237,7 +237,7 @@ nni_ep_remove(nni_ep *ep)
 
 
 static int
-nni_ep_connect(nni_ep *ep)
+nni_ep_connect_sync(nni_ep *ep)
 {
 	nni_pipe *pipe;
 	int rv;
@@ -245,7 +245,7 @@ nni_ep_connect(nni_ep *ep)
 	if ((rv = nni_pipe_create(&pipe, ep, ep->ep_sock, ep->ep_tran)) != 0) {
 		return (rv);
 	}
-	rv = ep->ep_ops.ep_connect(ep->ep_data, &pipe->p_tran_data);
+	rv = ep->ep_ops.ep_connect_sync(ep->ep_data, &pipe->p_tran_data);
 	if (rv != 0) {
 		nni_pipe_remove(pipe);
 		return (rv);
@@ -330,7 +330,7 @@ nni_dialer(void *arg)
 		}
 		nni_mtx_unlock(&ep->ep_mtx);
 
-		rv = nni_ep_connect(ep);
+		rv = nni_ep_connect_sync(ep);
 		switch (rv) {
 		case 0:
 			// good connection
@@ -383,7 +383,7 @@ nni_ep_dial(nni_ep *ep, int flags)
 
 	if (flags & NNG_FLAG_SYNCH) {
 		nni_mtx_unlock(&ep->ep_mtx);
-		rv = nni_ep_connect(ep);
+		rv = nni_ep_connect_sync(ep);
 		if (rv != 0) {
 			nni_thr_fini(&ep->ep_thr);
 			ep->ep_mode = NNI_EP_MODE_IDLE;
@@ -399,8 +399,8 @@ nni_ep_dial(nni_ep *ep, int flags)
 }
 
 
-int
-nni_ep_accept(nni_ep *ep)
+static int
+nni_ep_accept_sync(nni_ep *ep)
 {
 	nni_pipe *pipe;
 	int rv;
@@ -411,7 +411,7 @@ nni_ep_accept(nni_ep *ep)
 	if ((rv = nni_pipe_create(&pipe, ep, ep->ep_sock, ep->ep_tran)) != 0) {
 		return (rv);
 	}
-	rv = ep->ep_ops.ep_accept(ep->ep_data, &pipe->p_tran_data);
+	rv = ep->ep_ops.ep_accept_sync(ep->ep_data, &pipe->p_tran_data);
 	if (rv != 0) {
 		nni_pipe_remove(pipe);
 		return (rv);
@@ -464,7 +464,7 @@ nni_listener(void *arg)
 		}
 		nni_mtx_unlock(&ep->ep_mtx);
 
-		if ((rv = nni_ep_accept(ep)) == 0) {
+		if ((rv = nni_ep_accept_sync(ep)) == 0) {
 			// Success! Loop around for the next one.
 			continue;
 		}
diff --git a/src/core/transport.h b/src/core/transport.h
index 383526cb..5a057c93 100644
--- a/src/core/transport.h
+++ b/src/core/transport.h
@@ -51,7 +51,7 @@ struct nni_tran_ep {
 	// NNG_ETIMEDOUT, and NNG_EPROTO.  The first argument is the
 	// transport specific endpoint, and the second is a pointer to
 	// receive a newly created transport-specific pipe structure.
-	int	(*ep_connect)(void *, void **);
+	int	(*ep_connect_sync)(void *, void **);
 
 	// ep_bind just does the bind() and listen() work,
 	// reserving the address but not creating any connections.
@@ -63,7 +63,7 @@ struct nni_tran_ep {
 	// ep_accept accepts an inbound connection.  The first argument
 	// is the transport-specific endpoint, and the second is a pointer to
 	// a transport-specific pipe, created by this function.
-	int	(*ep_accept)(void *, void **);
+	int	(*ep_accept_sync)(void *, void **);
 
 	// ep_close stops the endpoint from operating altogether.  It does
 	// not affect pipes that have already been created.
diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c
index dc0baef0..5e06f3a8 100644
--- a/src/transport/inproc/inproc.c
+++ b/src/transport/inproc/inproc.c
@@ -286,7 +286,7 @@ nni_inproc_ep_close(void *arg)
 
 
 static int
-nni_inproc_ep_connect(void *arg, void **pipep)
+nni_inproc_ep_connect_sync(void *arg, void **pipep)
 {
 	nni_inproc_pipe *pipe;
 	nni_inproc_ep *ep = arg;
@@ -380,7 +380,7 @@ nni_inproc_ep_bind(void *arg)
 
 
 static int
-nni_inproc_ep_accept(void *arg, void **pipep)
+nni_inproc_ep_accept_sync(void *arg, void **pipep)
 {
 	nni_inproc_ep *ep = arg;
 	nni_inproc_ep *client;
@@ -455,14 +455,14 @@ static nni_tran_pipe nni_inproc_pipe_ops = {
 };
 
 static nni_tran_ep nni_inproc_ep_ops = {
-	.ep_init	= nni_inproc_ep_init,
-	.ep_fini	= nni_inproc_ep_fini,
-	.ep_connect	= nni_inproc_ep_connect,
-	.ep_bind	= nni_inproc_ep_bind,
-	.ep_accept	= nni_inproc_ep_accept,
-	.ep_close	= nni_inproc_ep_close,
-	.ep_setopt	= NULL,
-	.ep_getopt	= NULL,
+	.ep_init		= nni_inproc_ep_init,
+	.ep_fini		= nni_inproc_ep_fini,
+	.ep_connect_sync	= nni_inproc_ep_connect_sync,
+	.ep_bind		= nni_inproc_ep_bind,
+	.ep_accept_sync		= nni_inproc_ep_accept_sync,
+	.ep_close		= nni_inproc_ep_close,
+	.ep_setopt		= NULL,
+	.ep_getopt		= NULL,
 };
 
 // This is the inproc transport linkage, and should be the only global
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c
index 760be794..1bb94092 100644
--- a/src/transport/ipc/ipc.c
+++ b/src/transport/ipc/ipc.c
@@ -443,7 +443,7 @@ nni_ipc_negotiate(nni_ipc_pipe *pipe)
 
 
 static int
-nni_ipc_ep_connect(void *arg, void **pipep)
+nni_ipc_ep_connect_sync(void *arg, void **pipep)
 {
 	nni_ipc_ep *ep = arg;
 	nni_ipc_pipe *pipe;
@@ -498,7 +498,7 @@ nni_ipc_ep_bind(void *arg)
 
 
 static int
-nni_ipc_ep_accept(void *arg, void **pipep)
+nni_ipc_ep_accept_sync(void *arg, void **pipep)
 {
 	nni_ipc_ep *ep = arg;
 	nni_ipc_pipe *pipe;
@@ -533,14 +533,14 @@ static nni_tran_pipe nni_ipc_pipe_ops = {
 };
 
 static nni_tran_ep nni_ipc_ep_ops = {
-	.ep_init	= nni_ipc_ep_init,
-	.ep_fini	= nni_ipc_ep_fini,
-	.ep_connect	= nni_ipc_ep_connect,
-	.ep_bind	= nni_ipc_ep_bind,
-	.ep_accept	= nni_ipc_ep_accept,
-	.ep_close	= nni_ipc_ep_close,
-	.ep_setopt	= NULL,
-	.ep_getopt	= NULL,
+	.ep_init		= nni_ipc_ep_init,
+	.ep_fini		= nni_ipc_ep_fini,
+	.ep_connect_sync	= nni_ipc_ep_connect_sync,
+	.ep_bind		= nni_ipc_ep_bind,
+	.ep_accept_sync		= nni_ipc_ep_accept_sync,
+	.ep_close		= nni_ipc_ep_close,
+	.ep_setopt		= NULL,
+	.ep_getopt		= NULL,
 };
 
 // This is the IPC transport linkage, and should be the only global
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index 92653991..67a49a95 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -484,7 +484,7 @@ nni_tcp_negotiate(nni_tcp_pipe *pipe)
 
 
 static int
-nni_tcp_ep_connect(void *arg, void **pipep)
+nni_tcp_ep_connect_sync(void *arg, void **pipep)
 {
 	nni_tcp_ep *ep = arg;
 	nni_tcp_pipe *pipe;
@@ -588,7 +588,7 @@ nni_tcp_ep_bind(void *arg)
 
 
 static int
-nni_tcp_ep_accept(void *arg, void **pipep)
+nni_tcp_ep_accept_sync(void *arg, void **pipep)
 {
 	nni_tcp_ep *ep = arg;
 	nni_tcp_pipe *pipe;
@@ -624,14 +624,14 @@ static nni_tran_pipe nni_tcp_pipe_ops = {
 };
 
 static nni_tran_ep nni_tcp_ep_ops = {
-	.ep_init	= nni_tcp_ep_init,
-	.ep_fini	= nni_tcp_ep_fini,
-	.ep_connect	= nni_tcp_ep_connect,
-	.ep_bind	= nni_tcp_ep_bind,
-	.ep_accept	= nni_tcp_ep_accept,
-	.ep_close	= nni_tcp_ep_close,
-	.ep_setopt	= NULL,
-	.ep_getopt	= NULL,
+	.ep_init		= nni_tcp_ep_init,
+	.ep_fini		= nni_tcp_ep_fini,
+	.ep_connect_sync	= nni_tcp_ep_connect_sync,
+	.ep_bind		= nni_tcp_ep_bind,
+	.ep_accept_sync		= nni_tcp_ep_accept_sync,
+	.ep_close		= nni_tcp_ep_close,
+	.ep_setopt		= NULL,
+	.ep_getopt		= NULL,
 };
 
 // This is the TCP transport linkage, and should be the only global