diff options
Diffstat (limited to 'src/sp')
| -rw-r--r-- | src/sp/transport.h | 2 | ||||
| -rw-r--r-- | src/sp/transport/inproc/inproc.c | 4 | ||||
| -rw-r--r-- | src/sp/transport/ipc/ipc.c | 4 | ||||
| -rw-r--r-- | src/sp/transport/socket/sockfd.c | 2 | ||||
| -rw-r--r-- | src/sp/transport/tcp/tcp.c | 6 | ||||
| -rw-r--r-- | src/sp/transport/tls/tls.c | 6 | ||||
| -rw-r--r-- | src/sp/transport/udp/udp.c | 6 | ||||
| -rw-r--r-- | src/sp/transport/ws/websocket.c | 6 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/sp/transport.h b/src/sp/transport.h index 1c9f930b..733388e8 100644 --- a/src/sp/transport.h +++ b/src/sp/transport.h @@ -92,7 +92,7 @@ struct nni_sp_listener_ops { // address, or NNG_EACCESS for permission problems. The transport // should update the url if it has changed (e.g. due to converting // from port 0 to a real port.) - int (*l_bind)(void *, nng_url *); + nng_err (*l_bind)(void *, nng_url *); // l_accept accepts an inbound connection. void (*l_accept)(void *, nni_aio *); diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c index 1c7b88e6..8c662ca3 100644 --- a/src/sp/transport/inproc/inproc.c +++ b/src/sp/transport/inproc/inproc.c @@ -483,7 +483,7 @@ inproc_ep_connect(void *arg, nni_aio *aio) nni_mtx_unlock(&nni_inproc.mx); } -static int +static nng_err inproc_ep_bind(void *arg, nng_url *url) { inproc_ep *ep = arg; @@ -500,7 +500,7 @@ inproc_ep_bind(void *arg, nng_url *url) } nni_list_append(list, ep); nni_mtx_unlock(&nni_inproc.mx); - return (0); + return (NNG_OK); } static void diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c index 82ec3f7e..0163767b 100644 --- a/src/sp/transport/ipc/ipc.c +++ b/src/sp/transport/ipc/ipc.c @@ -902,11 +902,11 @@ ipc_ep_set_recv_max_sz(void *arg, const void *v, size_t sz, nni_type t) return (rv); } -static int +static nng_err ipc_ep_bind(void *arg, nng_url *url) { ipc_ep *ep = arg; - int rv; + nng_err rv; NNI_ARG_UNUSED(url); nni_mtx_lock(&ep->mtx); diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c index 5138afaa..e7b25d8b 100644 --- a/src/sp/transport/socket/sockfd.c +++ b/src/sp/transport/socket/sockfd.c @@ -768,7 +768,7 @@ sfd_tran_ep_set_recvmaxsz(void *arg, const void *v, size_t sz, nni_opt_type t) return (rv); } -static int +static nng_err sfd_tran_ep_bind(void *arg, nng_url *url) { sfd_tran_ep *ep = arg; diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c index 3bc124ee..6bcbca9e 100644 --- a/src/sp/transport/tcp/tcp.c +++ b/src/sp/transport/tcp/tcp.c @@ -913,15 +913,15 @@ tcptran_ep_set_recvmaxsz(void *arg, const void *v, size_t sz, nni_opt_type t) return (rv); } -static int +static nng_err tcptran_ep_bind(void *arg, nng_url *url) { tcptran_ep *ep = arg; - int rv; + nng_err rv; nni_mtx_lock(&ep->mtx); rv = nng_stream_listener_listen(ep->listener); - if (rv == 0) { + if (rv == NNG_OK) { int port; nng_stream_listener_get_int( ep->listener, NNG_OPT_TCP_BOUND_PORT, &port); diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index 643146f7..5d2e6d9e 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -853,15 +853,15 @@ tlstran_ep_connect(void *arg, nni_aio *aio) nni_mtx_unlock(&ep->mtx); } -static int +static nng_err tlstran_ep_bind(void *arg, nng_url *url) { tlstran_ep *ep = arg; - int rv; + nng_err rv; nni_mtx_lock(&ep->mtx); rv = nng_stream_listener_listen(ep->listener); - if (rv == 0) { + if (rv == NNG_OK) { int port; nng_stream_listener_get_int( ep->listener, NNG_OPT_TCP_BOUND_PORT, &port); diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c index 2e85fd0f..43fbabe1 100644 --- a/src/sp/transport/udp/udp.c +++ b/src/sp/transport/udp/udp.c @@ -1709,11 +1709,11 @@ udp_ep_start(udp_ep *ep) udp_start_rx(ep); } -static int +static nng_err udp_ep_bind(void *arg, nng_url *url) { udp_ep *ep = arg; - int rv; + nng_err rv; nni_mtx_lock(&ep->mtx); if (ep->started) { @@ -1722,7 +1722,7 @@ udp_ep_bind(void *arg, nng_url *url) } rv = nni_udp_open(&ep->udp, &ep->self_sa); - if (rv != 0) { + if (rv != NNG_OK) { nni_mtx_unlock(&ep->mtx); return (rv); } diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index f93b1f49..df157e02 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -225,13 +225,13 @@ wstran_pipe_peer(void *arg) return (p->peer); } -static int +static nng_err wstran_listener_bind(void *arg, nng_url *url) { ws_listener *l = arg; - int rv; + nng_err rv; - if ((rv = nng_stream_listener_listen(l->listener)) == 0) { + if ((rv = nng_stream_listener_listen(l->listener)) == NNG_OK) { int port; nng_stream_listener_get_int( l->listener, NNG_OPT_TCP_BOUND_PORT, &port); |
