Endpoint renaming.

7 files changed, 38 insertions, 42 deletions

diff --git a/src/core/defs.h b/src/core/defs.h
index eb561295..b10701e0 100644
--- a/src/core/defs.h
+++ b/src/core/defs.h
@@ -19,13 +19,10 @@
 
 // These types are common but have names shared with user space.
 typedef struct nng_socket	nni_sock;
-typedef struct nng_endpt	nni_ep;
+typedef struct nng_endpoint	nni_ep;
 typedef struct nng_pipe		nni_pipe;
 typedef struct nng_msg		nni_msg;
 
-// REMOVE THESE
-typedef struct nng_endpt	nni_endpt;
-
 // These are our own names.
 typedef struct nni_tran		nni_tran;
 typedef struct nni_tran_ep	nni_tran_ep;
diff --git a/src/core/endpt.c b/src/core/endpt.c
index e5f46978..58a4365b 100644
--- a/src/core/endpt.c
+++ b/src/core/endpt.c
@@ -16,10 +16,10 @@
 // Functionality realited to end points.
 
 int
-nni_endpt_create(nni_endpt **epp, nni_sock *sock, const char *addr)
+nni_ep_create(nni_ep **epp, nni_sock *sock, const char *addr)
 {
 	nni_tran *tran;
-	nni_endpt *ep;
+	nni_ep *ep;
 	int rv;
 
 	if ((tran = nni_tran_find(addr)) == NULL) {
@@ -69,7 +69,7 @@ nni_endpt_create(nni_endpt **epp, nni_sock *sock, const char *addr)
 
 
 void
-nni_endpt_close(nni_endpt *ep)
+nni_ep_close(nni_ep *ep)
 {
 	nni_pipe *pipe;
 	nni_mtx *mx = &ep->ep_sock->s_mx;
@@ -101,7 +101,7 @@ nni_endpt_close(nni_endpt *ep)
 
 
 static int
-nni_endpt_connect(nni_endpt *ep, nni_pipe **pp)
+nni_ep_connect(nni_ep *ep, nni_pipe **pp)
 {
 	nni_pipe *pipe;
 	int rv;
@@ -124,12 +124,12 @@ nni_endpt_connect(nni_endpt *ep, nni_pipe **pp)
 // nni_dial_once just does a single dial call, so it can be used
 // for synchronous dialing.
 static int
-nni_dial_once(nni_endpt *ep)
+nni_dial_once(nni_ep *ep)
 {
 	nni_pipe *pipe;
 	int rv;
 
-	if (((rv = nni_endpt_connect(ep, &pipe)) == 0) &&
+	if (((rv = nni_ep_connect(ep, &pipe)) == 0) &&
 	    ((rv = nni_pipe_start(pipe)) == 0)) {
 		return (0);
 	}
@@ -142,7 +142,7 @@ nni_dial_once(nni_endpt *ep)
 static void
 nni_dialer(void *arg)
 {
-	nni_endpt *ep = arg;
+	nni_ep *ep = arg;
 	nni_pipe *pipe;
 	int rv;
 	nni_time cooldown;
@@ -194,7 +194,7 @@ nni_dialer(void *arg)
 
 
 int
-nni_endpt_dial(nni_endpt *ep, int flags)
+nni_ep_dial(nni_ep *ep, int flags)
 {
 	int rv = 0;
 	nni_mtx *mx = &ep->ep_sock->s_mx;
@@ -234,7 +234,7 @@ nni_endpt_dial(nni_endpt *ep, int flags)
 
 
 int
-nni_endpt_accept(nni_endpt *ep, nni_pipe **pp)
+nni_ep_accept(nni_ep *ep, nni_pipe **pp)
 {
 	nni_pipe *pipe;
 	int rv;
@@ -258,7 +258,7 @@ nni_endpt_accept(nni_endpt *ep, nni_pipe **pp)
 static void
 nni_listener(void *arg)
 {
-	nni_endpt *ep = arg;
+	nni_ep *ep = arg;
 	nni_pipe *pipe;
 	int rv;
 	nni_mtx *mx = &ep->ep_sock->s_mx;
@@ -299,7 +299,7 @@ nni_listener(void *arg)
 
 		pipe = NULL;
 
-		if (((rv = nni_endpt_accept(ep, &pipe)) == 0) &&
+		if (((rv = nni_ep_accept(ep, &pipe)) == 0) &&
 		    ((rv = nni_pipe_start(pipe)) == 0)) {
 			continue;
 		}
@@ -326,7 +326,7 @@ nni_listener(void *arg)
 
 
 int
-nni_endpt_listen(nni_endpt *ep, int flags)
+nni_ep_listen(nni_ep *ep, int flags)
 {
 	int rv = 0;
 	nni_mtx *mx = &ep->ep_sock->s_mx;
diff --git a/src/core/endpt.h b/src/core/endpt.h
index 92e3450a..a8fce86a 100644
--- a/src/core/endpt.h
+++ b/src/core/endpt.h
@@ -15,7 +15,7 @@
 // NB: This structure is supplied here for use by the CORE. Use of this
 // OUSIDE of the core is STRICTLY VERBOTEN.  NO DIRECT ACCESS BY PROTOCOLS
 // OR TRANSPORTS.
-struct nng_endpt {
+struct nng_endpoint {
 	nni_tran_ep	ep_ops;
 	nni_tran	*ep_tran;
 	void *		ep_data;                // Transport private
@@ -34,10 +34,10 @@ struct nng_endpt {
 #define NNI_EP_MODE_DIAL	1
 #define NNI_EP_MODE_LISTEN	2
 
-extern int nni_endpt_create(nni_endpt **, nni_sock *, const char *);
-extern int nni_endpt_accept(nni_endpt *, nni_pipe **);
-extern void nni_endpt_close(nni_endpt *);
-extern int nni_endpt_dial(nni_endpt *, int);
-extern int nni_endpt_listen(nni_endpt *, int);
+extern int nni_ep_create(nni_ep **, nni_sock *, const char *);
+extern int nni_ep_accept(nni_ep *, nni_pipe **);
+extern void nni_ep_close(nni_ep *);
+extern int nni_ep_dial(nni_ep *, int);
+extern int nni_ep_listen(nni_ep *, int);
 
 #endif // CORE_ENDPT_H
diff --git a/src/core/pipe.c b/src/core/pipe.c
index ce24e28e..e8864d58 100644
--- a/src/core/pipe.c
+++ b/src/core/pipe.c
@@ -84,7 +84,7 @@ nni_pipe_destroy(nni_pipe *p)
 
 
 int
-nni_pipe_create(nni_pipe **pp, nni_endpt *ep)
+nni_pipe_create(nni_pipe **pp, nni_ep *ep)
 {
 	nni_pipe *p;
 	nni_sock *sock = ep->ep_sock;
diff --git a/src/core/pipe.h b/src/core/pipe.h
index d3669235..f037bb3b 100644
--- a/src/core/pipe.h
+++ b/src/core/pipe.h
@@ -25,7 +25,7 @@ struct nng_pipe {
 	size_t		p_psize;                // size of protocol data
 	nni_list_node	p_node;
 	nni_sock *	p_sock;
-	nni_endpt *	p_ep;
+	nni_ep *	p_ep;
 	int		p_reap;
 	int		p_active;
 	nni_thr		p_send_thr;
@@ -40,7 +40,7 @@ extern void nni_pipe_close(nni_pipe *);
 
 // Used only by the socket core - as we don't wish to expose the details
 // of the pipe structure outside of pipe.c.
-extern int nni_pipe_create(nni_pipe **, nni_endpt *);
+extern int nni_pipe_create(nni_pipe **, nni_ep *);
 
 extern void nni_pipe_destroy(nni_pipe *);
 
diff --git a/src/core/socket.c b/src/core/socket.c
index 07955d0a..6aa40bfc 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -39,7 +39,7 @@ nni_reaper(void *arg)
 
 	for (;;) {
 		nni_pipe *pipe;
-		nni_endpt *ep;
+		nni_ep *ep;
 
 		nni_mtx_lock(&sock->s_mx);
 		if ((pipe = nni_list_first(&sock->s_reaps)) != NULL) {
@@ -102,7 +102,7 @@ nni_sock_open(nni_sock **sockp, uint16_t proto)
 	sock->s_reconnmax = NNI_SECOND;
 	NNI_LIST_INIT(&sock->s_pipes, nni_pipe, p_node);
 	NNI_LIST_INIT(&sock->s_reaps, nni_pipe, p_node);
-	NNI_LIST_INIT(&sock->s_eps, nni_endpt, ep_node);
+	NNI_LIST_INIT(&sock->s_eps, nni_ep, ep_node);
 
 	if ((rv = nni_mtx_init(&sock->s_mx)) != 0) {
 		NNI_FREE_STRUCT(sock);
@@ -157,7 +157,7 @@ int
 nni_sock_close(nni_sock *sock)
 {
 	nni_pipe *pipe;
-	nni_endpt *ep;
+	nni_ep *ep;
 	nni_time linger;
 
 	nni_mtx_lock(&sock->s_mx);
@@ -168,7 +168,7 @@ nni_sock_close(nni_sock *sock)
 	// we're closing.
 	while ((ep = nni_list_first(&sock->s_eps)) != NULL) {
 		nni_mtx_unlock(&sock->s_mx);
-		nni_endpt_close(ep);
+		nni_ep_close(ep);
 		nni_mtx_lock(&sock->s_mx);
 	}
 
@@ -323,17 +323,17 @@ nni_sock_proto(nni_sock *sock)
 
 
 int
-nni_sock_dial(nni_sock *sock, const char *addr, nni_endpt **epp, int flags)
+nni_sock_dial(nni_sock *sock, const char *addr, nni_ep **epp, int flags)
 {
-	nni_endpt *ep;
+	nni_ep *ep;
 	int rv;
 
-	if ((rv = nni_endpt_create(&ep, sock, addr)) != 0) {
+	if ((rv = nni_ep_create(&ep, sock, addr)) != 0) {
 		return (rv);
 	}
-	rv = nni_endpt_dial(ep, flags);
+	rv = nni_ep_dial(ep, flags);
 	if (rv != 0) {
-		nni_endpt_close(ep);
+		nni_ep_close(ep);
 	} else {
 		if (epp != NULL) {
 			*epp = ep;
@@ -344,18 +344,17 @@ nni_sock_dial(nni_sock *sock, const char *addr, nni_endpt **epp, int flags)
 
 
 int
-nni_sock_listen(nni_sock *sock, const char *addr, nni_endpt **epp,
-    int flags)
+nni_sock_listen(nni_sock *sock, const char *addr, nni_ep **epp, int flags)
 {
-	nni_endpt *ep;
+	nni_ep *ep;
 	int rv;
 
-	if ((rv = nni_endpt_create(&ep, sock, addr)) != 0) {
+	if ((rv = nni_ep_create(&ep, sock, addr)) != 0) {
 		return (rv);
 	}
-	rv = nni_endpt_listen(ep, flags);
+	rv = nni_ep_listen(ep, flags);
 	if (rv != 0) {
-		nni_endpt_close(ep);
+		nni_ep_close(ep);
 	} else {
 		if (epp != NULL) {
 			*epp = ep;
diff --git a/src/core/socket.h b/src/core/socket.h
index d0f5f3a3..548b4697 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -52,8 +52,8 @@ extern int nni_sock_setopt(nni_sock *, int, const void *, size_t);
 extern int nni_sock_getopt(nni_sock *, int, void *, size_t *);
 extern int nni_sock_recvmsg(nni_sock *, nni_msg **, nni_time);
 extern int nni_sock_sendmsg(nni_sock *, nni_msg *, nni_time);
-extern int nni_sock_dial(nni_sock *, const char *, nni_endpt **, int);
-extern int nni_sock_listen(nni_sock *, const char *, nni_endpt **, int);
+extern int nni_sock_dial(nni_sock *, const char *, nni_ep **, int);
+extern int nni_sock_listen(nni_sock *, const char *, nni_ep **, int);
 
 // Set error codes for applications.  These are only ever
 // called from the filter functions in protocols, and thus