diff options
| -rw-r--r-- | src/core/defs.h | 5 | ||||
| -rw-r--r-- | src/core/endpt.c | 24 | ||||
| -rw-r--r-- | src/core/endpt.h | 12 | ||||
| -rw-r--r-- | src/core/pipe.c | 2 | ||||
| -rw-r--r-- | src/core/pipe.h | 4 | ||||
| -rw-r--r-- | src/core/socket.c | 29 | ||||
| -rw-r--r-- | src/core/socket.h | 4 | ||||
| -rw-r--r-- | src/nng.c | 4 | ||||
| -rw-r--r-- | src/nng.h | 46 |
9 files changed, 63 insertions, 67 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 @@ -97,7 +97,7 @@ nng_sendmsg(nng_socket *s, nng_msg *msg, int flags) int -nng_dial(nng_socket *s, const char *addr, nng_endpt **epp, int flags) +nng_dial(nng_socket *s, const char *addr, nng_endpoint **epp, int flags) { NNI_INIT_INT(); return (nni_sock_dial(s, addr, epp, flags)); @@ -105,7 +105,7 @@ nng_dial(nng_socket *s, const char *addr, nng_endpt **epp, int flags) int -nng_listen(nng_socket *s, const char *addr, nng_endpt **epp, int flags) +nng_listen(nng_socket *s, const char *addr, nng_endpoint **epp, int flags) { NNI_INIT_INT(); return (nni_sock_listen(s, addr, epp, flags)); @@ -35,7 +35,7 @@ extern "C" { // Types common to nng. typedef struct nng_socket nng_socket; -typedef struct nng_endpt nng_endpt; +typedef struct nng_endpoint nng_endpoint; typedef struct nng_pipe nng_pipe; typedef struct nng_msg nng_msg; typedef struct nng_event nng_event; @@ -91,68 +91,68 @@ NNG_DECL int nng_unsetnotify(nng_socket *, nng_notify *); // NNG_EVENT_SEND - A message can be sent. // NNG_EVENT_ERROR - An error condition on the socket occurred. // NNG_EVENT_PIPE_ADD - A new pipe (connection) is added to the socket. -// NNG_EVENT_PIPE_RM - A pipe (connection) is removed from the socket. +// NNG_EVENT_PIPE_REM - A pipe (connection) is removed from the socket. // NNG_EVENT_ENDPT_ADD - An endpoint is added to the socket. -// NNG_EVENT_ENDPT_RM - An endpoint is removed from the socket. +// NNG_EVENT_ENDPT_REM - An endpoint is removed from the socket. #define NNG_EVENT_BIT(x) (1U << (x)) #define NNG_EVENT_RECV NNG_EVENT_BIT(0) #define NNG_EVENT_SEND NNG_EVENT_BIT(1) #define NNG_EVENT_ERROR NNG_EVENT_BIT(2) #define NNG_EVENT_PIPE_ADD NNG_EVENT_BIT(3) -#define NNG_EVENT_PIPE_RM NNG_EVENT_BIT(4) -#define NNG_EVENT_ENDPT_ADD NNG_EVENT_BIT(5) -#define NNG_EVENT_ENDPT_RM NNG_EVENT_BIT(6) +#define NNG_EVENT_PIPE_REM NNG_EVENT_BIT(4) +#define NNG_EVENT_ENDPOINT_ADD NNG_EVENT_BIT(5) +#define NNG_EVENT_ENDPOINT_REM NNG_EVENT_BIT(6) // The following functions return more detailed information about the event. // Some of the values will not make sense for some event types, in which case // the value returned will be NULL. NNG_DECL int nng_event_type(nng_event *); NNG_DECL nng_socket *nng_event_socket(nng_event *); -NNG_DECL nng_endpt *nng_event_endpt(nng_event *); +NNG_DECL nng_endpoint *nng_event_endpoint(nng_event *); NNG_DECL nng_pipe *nng_event_pipe(nng_event *); NNG_DECL const char *nng_event_reason(nng_event *); // nng_listen creates a listening endpoint with no special options, // and starts it listening. It is functionally equivalent to the legacy // nn_bind(). The underlying endpoint is returned back to the caller in the -// endpt pointer, if it is not NULL. The flags may be NNG_FLAG_SYNCH to +// endpoint pointer, if it is not NULL. The flags may be NNG_FLAG_SYNCH to // indicate that a failure setting the socket up should return an error // back to the caller immediately. -NNG_DECL int nng_listen(nng_socket *, const char *, nng_endpt **, int); +NNG_DECL int nng_listen(nng_socket *, const char *, nng_endpoint **, int); // nng_dial creates a dialing endpoint, with no special options, and // starts it dialing. Dialers have at most one active connection at a time // This is similar to the legacy nn_connect(). The underlying endpoint -// is returned back to the caller in the endpt pointer, if it is not NULL. +// is returned back to the caller in the endpoint pointer, if it is not NULL. // The flags may be NNG_FLAG_SYNCH to indicate that the first attempt to // dial will be made synchronously, and a failure condition returned back // to the caller. (If the connection is dropped, it will still be // reconnected in the background -- only the initial connect is synchronous.) -NNG_DECL int nng_dial(nng_socket *, const char *, nng_endpt **, int); +NNG_DECL int nng_dial(nng_socket *, const char *, nng_endpoint **, int); -// nng_endpt_create creates an endpoint on the socket, but does not +// nng_endpoint_create creates an endpoint on the socket, but does not // start it either dialing or listening. -NNG_DECL int nng_endpt_create(nng_endpt **, nng_socket *, const char *); +NNG_DECL int nng_endpoint_create(nng_endpoint **, nng_socket *, const char *); -// nng_endpt_dial starts the endpoint dialing. This is only possible if +// nng_endpoint_dial starts the endpoint dialing. This is only possible if // the endpoint is not already dialing or listening. -NNG_DECL int nng_endpt_dial(nng_endpt *, int); +NNG_DECL int nng_endpoint_dial(nng_endpoint *, int); -// nng_endpt_listen starts the endpoint listening. This is only possible if +// nng_endpoint_listen starts the endpoint listening. This is only possible if // the endpoint is not already dialing or listening. -NNG_DECL int nng_endpt_listen(nng_endpt *, int); +NNG_DECL int nng_endpoint_listen(nng_endpoint *, int); -// nng_endpt_close closes the endpt, shutting down all underlying +// nng_endpoint_close closes the endpointt, shutting down all underlying // connections and releasing all associated resources. It is an error to // refer to the endpoint after this is called. -NNG_DECL int nng_endpt_close(nng_endpt *); +NNG_DECL int nng_endpoint_close(nng_endpoint *); -// nng_endpt_setopt sets an option for a specific endpoint. Note +// nng_endpoint_setopt sets an option for a specific endpoint. Note // endpoint options may not be altered on a running endpoint. -NNG_DECL int nng_endpt_setopt(nng_endpt *, int, void *, size_t); +NNG_DECL int nng_endpoint_setopt(nng_endpoint *, int, void *, size_t); -// nng_endpt_getopt obtains the option for an endpoint. -NNG_DECL int nng_endpt_getopt(nng_endpt *, int, void *, size_t *); +// nng_endpoint_getopt obtains the option for an endpoint. +NNG_DECL int nng_endpoint_getopt(nng_endpoint *, int, void *, size_t *); // nng_strerror returns a human readable string associated with the error // code supplied. |