diff options
| -rw-r--r-- | src/sp/transport.h | 22 | ||||
| -rw-r--r-- | src/sp/transport/inproc/inproc.c | 12 | ||||
| -rw-r--r-- | src/sp/transport/ipc/ipc.c | 33 | ||||
| -rw-r--r-- | src/sp/transport/socket/sockfd.c | 17 | ||||
| -rw-r--r-- | src/sp/transport/tcp/tcp.c | 33 | ||||
| -rw-r--r-- | src/sp/transport/tls/tls.c | 39 | ||||
| -rw-r--r-- | src/sp/transport/udp/udp.c | 26 | ||||
| -rw-r--r-- | src/sp/transport/ws/websocket.c | 46 |
8 files changed, 117 insertions, 111 deletions
diff --git a/src/sp/transport.h b/src/sp/transport.h index e4e3e156..9d67b7c2 100644 --- a/src/sp/transport.h +++ b/src/sp/transport.h @@ -33,7 +33,7 @@ struct nni_sp_dialer_ops { // d_init creates a vanilla dialer. The value created is // used for the first argument for all other dialer functions. - int (*d_init)(void *, nng_url *, nni_dialer *); + nng_err (*d_init)(void *, nng_url *, nni_dialer *); // d_fini frees the resources associated with the dialer. // The dialer will already have been closed. @@ -53,18 +53,19 @@ struct nni_sp_dialer_ops { void (*d_stop)(void *); // d_getopt is used to obtain an option. - int (*d_getopt)(void *, const char *, void *, size_t *, nni_type); + nng_err (*d_getopt)(void *, const char *, void *, size_t *, nni_type); // d_setopt is used to set or change an option. - int (*d_setopt)(void *, const char *, const void *, size_t, nni_type); + nng_err (*d_setopt)( + void *, const char *, const void *, size_t, nni_type); // d_get_tls is used to get the TLS configuration to use for dialing. // This may be NULL if the dialer does not support TLS. - int (*d_get_tls)(void *, nng_tls_config **); + nng_err (*d_get_tls)(void *, nng_tls_config **); // d_set_tls is used to set the TLS configruation to use for the // dialer. This may be NULL if this dialer does not support TLS. - int (*d_set_tls)(void *, nng_tls_config *); + nng_err (*d_set_tls)(void *, nng_tls_config *); // d_options is an array of dialer options. The final // element must have a NULL name. If this member is NULL, then @@ -79,7 +80,7 @@ struct nni_sp_listener_ops { // l_init creates a vanilla listener. The value created is // used for the first argument for all other listener functions. - int (*l_init)(void *, nng_url *, nni_listener *); + nng_err (*l_init)(void *, nng_url *, nni_listener *); // l_fini frees the resources associated with the listener. // The listener will already have been closed. @@ -106,18 +107,19 @@ struct nni_sp_listener_ops { void (*l_stop)(void *); // l_getopt is used to obtain an option. - int (*l_getopt)(void *, const char *, void *, size_t *, nni_type); + nng_err (*l_getopt)(void *, const char *, void *, size_t *, nni_type); // l_setopt is used to set or change an option. - int (*l_setopt)(void *, const char *, const void *, size_t, nni_type); + nng_err (*l_setopt)( + void *, const char *, const void *, size_t, nni_type); // l_get_tls is used to get the TLS configuration to use for listening. // This may be NULL if the listener does not support TLS. - int (*l_get_tls)(void *, nng_tls_config **); + nng_err (*l_get_tls)(void *, nng_tls_config **); // l_set_tls is used to set the TLS configruation to use for listening. // This may be NULL if this listener does not support TLS. - int (*l_set_tls)(void *, nng_tls_config *); + nng_err (*l_set_tls)(void *, nng_tls_config *); // l_set_security_descriptor is used exclusively on Windows. nng_err (*l_set_security_descriptor)(void *, void *); diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c index 95500932..24c0f1ad 100644 --- a/src/sp/transport/inproc/inproc.c +++ b/src/sp/transport/inproc/inproc.c @@ -270,24 +270,24 @@ inproc_ep_init(inproc_ep *ep, nni_sock *sock, const nng_url *url) ep->addr = url->u_path; // we match on the URL path. } -static int +static nng_err inproc_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) { inproc_ep *ep = arg; ep->dialer = ndialer; inproc_ep_init(ep, nni_dialer_sock(ndialer), url); - return (0); + return (NNG_OK); } -static int +static nng_err inproc_listener_init(void *arg, nng_url *url, nni_listener *nlistener) { inproc_ep *ep = arg; ep->listener = nlistener; inproc_ep_init(ep, nni_listener_sock(nlistener), url); - return (0); + return (NNG_OK); } static void @@ -616,13 +616,13 @@ static const nni_option inproc_ep_options[] = { }, }; -static int +static nng_err inproc_ep_getopt(void *arg, const char *name, void *v, size_t *szp, nni_type t) { return (nni_getopt(inproc_ep_options, name, arg, v, szp, t)); } -static int +static nng_err inproc_ep_setopt( void *arg, const char *name, const void *v, size_t sz, nni_type t) { diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c index 35d4cc97..67038e2e 100644 --- a/src/sp/transport/ipc/ipc.c +++ b/src/sp/transport/ipc/ipc.c @@ -795,43 +795,44 @@ ipc_ep_init(ipc_ep *ep, nni_sock *sock, void (*conn_cb)(void *)) #endif } -static int +static nng_err ipc_ep_init_dialer(void *arg, nng_url *url, nni_dialer *dialer) { ipc_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_dialer_sock(dialer); ipc_ep_init(ep, sock, ipc_ep_dial_cb); ep->ndialer = dialer; - if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != 0) { + if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_dialer_add_stat(dialer, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } -static int +static nng_err ipc_ep_init_listener(void *arg, nng_url *url, nni_listener *listener) { ipc_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_listener_sock(listener); ipc_ep_init(ep, sock, ipc_ep_accept_cb); ep->nlistener = listener; - if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != 0) { + if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != + NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_listener_add_stat(listener, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } static void @@ -979,11 +980,11 @@ static const nni_option ipc_ep_options[] = { }, }; -static int +static nng_err ipc_dialer_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t) { ipc_ep *ep = arg; - int rv; + nng_err rv; rv = nni_getopt(ipc_ep_options, name, ep, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -992,12 +993,12 @@ ipc_dialer_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t) return (rv); } -static int +static nng_err ipc_dialer_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { ipc_ep *ep = arg; - int rv; + nng_err rv; rv = nni_setopt(ipc_ep_options, name, ep, buf, sz, t); if (rv == NNG_ENOTSUP) { @@ -1006,12 +1007,12 @@ ipc_dialer_set( return (rv); } -static int +static nng_err ipc_listener_get( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { ipc_ep *ep = arg; - int rv; + nng_err rv; rv = nni_getopt(ipc_ep_options, name, ep, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -1020,12 +1021,12 @@ ipc_listener_get( return (rv); } -static int +static nng_err ipc_listener_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { ipc_ep *ep = arg; - int rv; + nng_err rv; rv = nni_setopt(ipc_ep_options, name, ep, buf, sz, t); if (rv == NNG_ENOTSUP) { diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c index c50360af..37debc85 100644 --- a/src/sp/transport/socket/sockfd.c +++ b/src/sp/transport/socket/sockfd.c @@ -682,11 +682,11 @@ error: nni_mtx_unlock(&ep->mtx); } -static int +static nng_err sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) { sfd_tran_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_listener_sock(nlistener); ep->nlistener = nlistener; @@ -715,7 +715,8 @@ sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) return (NNG_EADDRINVAL); } - if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != 0) { + if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != + NNG_OK) { sfd_tran_ep_fini(ep); return (rv); } @@ -724,7 +725,7 @@ sfd_tran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) nni_listener_add_stat(nlistener, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } static void @@ -830,12 +831,12 @@ static const nni_option sfd_tran_ep_opts[] = { }, }; -static int +static nng_err sfd_tran_listener_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { sfd_tran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_listener_get(ep->listener, name, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -844,12 +845,12 @@ sfd_tran_listener_getopt( return (rv); } -static int +static nng_err sfd_tran_listener_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { sfd_tran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_listener_set(ep->listener, name, buf, sz, t); if (rv == NNG_ENOTSUP) { diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c index 897d8ed6..d77e7b2f 100644 --- a/src/sp/transport/tcp/tcp.c +++ b/src/sp/transport/tcp/tcp.c @@ -786,11 +786,11 @@ tcptran_ep_init(tcptran_ep *ep, nni_sock *sock, void (*conn_cb)(void *)) #endif } -static int +static nng_err tcptran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) { tcptran_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_dialer_sock(ndialer); ep->ndialer = ndialer; @@ -806,21 +806,21 @@ tcptran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) return (NNG_EADDRINVAL); } - if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != 0) { + if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_dialer_add_stat(ndialer, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } -static int +static nng_err tcptran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) { tcptran_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_listener_sock(nlistener); ep->nlistener = nlistener; @@ -835,14 +835,15 @@ tcptran_listener_init(void *arg, nng_url *url, nni_listener *nlistener) return (NNG_EADDRINVAL); } - if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != 0) { + if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != + NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_listener_add_stat(nlistener, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } static void @@ -987,12 +988,12 @@ static const nni_option tcptran_ep_opts[] = { }, }; -static int +static nng_err tcptran_dialer_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { tcptran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_dialer_get(ep->dialer, name, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -1001,12 +1002,12 @@ tcptran_dialer_getopt( return (rv); } -static int +static nng_err tcptran_dialer_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { tcptran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_dialer_set(ep->dialer, name, buf, sz, t); if (rv == NNG_ENOTSUP) { @@ -1015,12 +1016,12 @@ tcptran_dialer_setopt( return (rv); } -static int +static nng_err tcptran_listener_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { tcptran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_listener_get(ep->listener, name, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -1029,12 +1030,12 @@ tcptran_listener_getopt( return (rv); } -static int +static nng_err tcptran_listener_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { tcptran_ep *ep = arg; - int rv; + nng_err rv; rv = nni_stream_listener_set(ep->listener, name, buf, sz, t); if (rv == NNG_ENOTSUP) { diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index 78e8ef35..5c567692 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -757,11 +757,11 @@ tlstran_ep_init(tlstran_ep *ep, nni_sock *sock, nni_cb conn_cb) return (0); } -static int +static nng_err tlstran_ep_init_dialer(void *arg, nng_url *url, nni_dialer *ndialer) { tlstran_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_dialer_sock(ndialer); tlstran_ep_init(ep, sock, tlstran_dial_cb); @@ -777,20 +777,20 @@ tlstran_ep_init_dialer(void *arg, nng_url *url, nni_dialer *ndialer) return (NNG_EADDRINVAL); } - if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != 0) { + if ((rv = nng_stream_dialer_alloc_url(&ep->dialer, url)) != NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_dialer_add_stat(ndialer, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } -static int +static nng_err tlstran_ep_init_listener(void *arg, nng_url *url, nni_listener *nlistener) { tlstran_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_listener_sock(nlistener); tlstran_ep_init(ep, sock, tlstran_accept_cb); @@ -804,14 +804,15 @@ tlstran_ep_init_listener(void *arg, nng_url *url, nni_listener *nlistener) (url->u_query != NULL)) { return (NNG_EADDRINVAL); } - if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != 0) { + if ((rv = nng_stream_listener_alloc_url(&ep->listener, url)) != + NNG_OK) { return (rv); } #ifdef NNG_ENABLE_STATS nni_listener_add_stat(nlistener, &ep->st_rcv_max); #endif - return (0); + return (NNG_OK); } static void @@ -975,11 +976,11 @@ static nni_option tlstran_ep_options[] = { }, }; -static int +static nng_err tlstran_dialer_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { - int rv; + nng_err rv; tlstran_ep *ep = arg; rv = nni_stream_dialer_get(ep->dialer, name, buf, szp, t); @@ -989,11 +990,11 @@ tlstran_dialer_getopt( return (rv); } -static int +static nng_err tlstran_dialer_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { - int rv; + nng_err rv; tlstran_ep *ep = arg; rv = nni_stream_dialer_set( @@ -1004,11 +1005,11 @@ tlstran_dialer_setopt( return (rv); } -static int +static nng_err tlstran_listener_get( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { - int rv; + nng_err rv; tlstran_ep *ep = arg; rv = nni_stream_listener_get(ep->listener, name, buf, szp, t); @@ -1018,7 +1019,7 @@ tlstran_listener_get( return (rv); } -static int +static nng_err tlstran_listener_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { @@ -1033,28 +1034,28 @@ tlstran_listener_set( return (rv); } -static int +static nng_err tlstran_listener_set_tls(void *arg, nng_tls_config *cfg) { tlstran_ep *ep = arg; return (nni_stream_listener_set_tls(ep->listener, cfg)); } -static int +static nng_err tlstran_listener_get_tls(void *arg, nng_tls_config **cfgp) { tlstran_ep *ep = arg; return (nni_stream_listener_get_tls(ep->listener, cfgp)); } -static int +static nng_err tlstran_dialer_set_tls(void *arg, nng_tls_config *cfg) { tlstran_ep *ep = arg; return (nni_stream_dialer_set_tls(ep->dialer, cfg)); } -static int +static nng_err tlstran_dialer_get_tls(void *arg, nng_tls_config **cfgp) { tlstran_ep *ep = arg; diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c index fd13461b..0aa46767 100644 --- a/src/sp/transport/udp/udp.c +++ b/src/sp/transport/udp/udp.c @@ -1390,39 +1390,39 @@ udp_check_url(nng_url *url, bool listen) return (0); } -static int +static nng_err udp_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) { udp_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_dialer_sock(ndialer); ep->ndialer = ndialer; - if ((rv = udp_ep_init(ep, url, sock, ndialer, NULL)) != 0) { + if ((rv = udp_ep_init(ep, url, sock, ndialer, NULL)) != NNG_OK) { return (rv); } - if ((rv = udp_check_url(url, false)) != 0) { + if ((rv = udp_check_url(url, false)) != NNG_OK) { return (rv); } - return (0); + return (NNG_OK); } -static int +static nng_err udp_listener_init(void *arg, nng_url *url, nni_listener *nlistener) { udp_ep *ep = arg; - int rv; + nng_err rv; nni_sock *sock = nni_listener_sock(nlistener); ep->nlistener = nlistener; - if ((rv = udp_ep_init(ep, url, sock, NULL, nlistener)) != 0) { + if ((rv = udp_ep_init(ep, url, sock, NULL, nlistener)) != NNG_OK) { return (rv); } // Check for invalid URL components. if (((rv = udp_check_url(url, true)) != 0) || - ((rv = nni_url_to_address(&ep->self_sa, url)) != 0)) { + ((rv = nni_url_to_address(&ep->self_sa, url)) != NNG_OK)) { return (rv); } @@ -1797,7 +1797,7 @@ static const nni_option udp_ep_opts[] = { }, }; -static int +static nng_err udp_dialer_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { @@ -1806,7 +1806,7 @@ udp_dialer_getopt( return (nni_getopt(udp_ep_opts, name, ep, buf, szp, t)); } -static int +static nng_err udp_dialer_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { @@ -1815,7 +1815,7 @@ udp_dialer_setopt( return (nni_setopt(udp_ep_opts, name, ep, buf, sz, t)); } -static int +static nng_err udp_listener_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { @@ -1824,7 +1824,7 @@ udp_listener_getopt( return (nni_getopt(udp_ep_opts, name, ep, buf, szp, t)); } -static int +static nng_err udp_listener_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index df157e02..b6045306 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -505,12 +505,12 @@ error: nni_mtx_unlock(&l->mtx); } -static int +static nng_err wstran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) { ws_dialer *d = arg; nni_sock *s = nni_dialer_sock(ndialer); - int rv; + nng_err rv; char name[64]; nni_mtx_init(&d->mtx); @@ -524,22 +524,22 @@ wstran_dialer_init(void *arg, nng_url *url, nni_dialer *ndialer) snprintf( name, sizeof(name), "%s.sp.nanomsg.org", nni_sock_peer_name(s)); - if (((rv = nni_ws_dialer_alloc(&d->dialer, url)) != 0) || + if (((rv = nni_ws_dialer_alloc(&d->dialer, url)) != NNG_OK) || ((rv = nng_stream_dialer_set_bool( - d->dialer, NNI_OPT_WS_MSGMODE, true)) != 0) || + d->dialer, NNI_OPT_WS_MSGMODE, true)) != NNG_OK) || ((rv = nng_stream_dialer_set_string( - d->dialer, NNG_OPT_WS_PROTOCOL, name)) != 0)) { + d->dialer, NNG_OPT_WS_PROTOCOL, name)) != NNG_OK)) { return (rv); } - return (0); + return (NNG_OK); } -static int +static nng_err wstran_listener_init(void *arg, nng_url *url, nni_listener *listener) { ws_listener *l = arg; - int rv; + nng_err rv; nni_sock *s = nni_listener_sock(listener); char name[64]; @@ -555,14 +555,14 @@ wstran_listener_init(void *arg, nng_url *url, nni_listener *listener) snprintf( name, sizeof(name), "%s.sp.nanomsg.org", nni_sock_proto_name(s)); - if (((rv = nni_ws_listener_alloc(&l->listener, url)) != 0) || + if (((rv = nni_ws_listener_alloc(&l->listener, url)) != NNG_OK) || ((rv = nng_stream_listener_set_bool( - l->listener, NNI_OPT_WS_MSGMODE, true)) != 0) || + l->listener, NNI_OPT_WS_MSGMODE, true)) != NNG_OK) || ((rv = nng_stream_listener_set_string( - l->listener, NNG_OPT_WS_PROTOCOL, name)) != 0)) { + l->listener, NNG_OPT_WS_PROTOCOL, name)) != NNG_OK)) { return (rv); } - return (0); + return (NNG_OK); } static void @@ -582,12 +582,12 @@ static const nni_option wstran_ep_opts[] = { }, }; -static int +static nng_err wstran_dialer_getopt( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { ws_dialer *d = arg; - int rv; + nng_err rv; rv = nni_stream_dialer_get(d->dialer, name, buf, szp, t); if (rv == NNG_ENOTSUP) { @@ -596,12 +596,12 @@ wstran_dialer_getopt( return (rv); } -static int +static nng_err wstran_dialer_setopt( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { ws_dialer *d = arg; - int rv; + nng_err rv; rv = nni_stream_dialer_set(d->dialer, name, buf, sz, t); if (rv == NNG_ENOTSUP) { @@ -610,21 +610,21 @@ wstran_dialer_setopt( return (rv); } -static int +static nng_err wstran_dialer_get_tls(void *arg, nng_tls_config **tls) { ws_dialer *d = arg; return (nni_stream_dialer_get_tls(d->dialer, tls)); } -static int +static nng_err wstran_dialer_set_tls(void *arg, nng_tls_config *tls) { ws_dialer *d = arg; return (nni_stream_dialer_set_tls(d->dialer, tls)); } -static int +static nng_err wstran_listener_get( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { @@ -638,12 +638,12 @@ wstran_listener_get( return (rv); } -static int +static nng_err wstran_listener_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { ws_listener *l = arg; - int rv; + nng_err rv; rv = nni_stream_listener_set(l->listener, name, buf, sz, t); if (rv == NNG_ENOTSUP) { @@ -652,14 +652,14 @@ wstran_listener_set( return (rv); } -static int +static nng_err wstran_listener_get_tls(void *arg, nng_tls_config **tls) { ws_listener *l = arg; return (nni_stream_listener_get_tls(l->listener, tls)); } -static int +static nng_err wstran_listener_set_tls(void *arg, nng_tls_config *tls) { ws_listener *l = arg; |
