diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/defs.h | 13 | ||||
| -rw-r--r-- | src/core/dialer.c | 2 | ||||
| -rw-r--r-- | src/core/listener.c | 2 | ||||
| -rw-r--r-- | src/core/pipe.c | 6 | ||||
| -rw-r--r-- | src/core/sockimpl.h | 10 |
5 files changed, 15 insertions, 18 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; |