diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/listener.c | 2 | ||||
| -rw-r--r-- | src/core/listener.h | 2 | ||||
| -rw-r--r-- | src/core/options.c | 52 | ||||
| -rw-r--r-- | src/core/options.h | 38 | ||||
| -rw-r--r-- | src/core/pollable.c | 8 | ||||
| -rw-r--r-- | src/core/pollable.h | 6 | ||||
| -rw-r--r-- | src/core/protocol.h | 4 | ||||
| -rw-r--r-- | src/core/socket.c | 40 | ||||
| -rw-r--r-- | src/core/sockfd.c | 14 | ||||
| -rw-r--r-- | src/core/stream.c | 102 | ||||
| -rw-r--r-- | src/core/stream.h | 46 | ||||
| -rw-r--r-- | src/core/tcp.c | 4 |
12 files changed, 161 insertions, 157 deletions
diff --git a/src/core/listener.c b/src/core/listener.c index 0ba745c9..d1f3b497 100644 --- a/src/core/listener.c +++ b/src/core/listener.c @@ -557,7 +557,7 @@ nni_listener_set_tls(nni_listener *l, nng_tls_config *cfg) return (l->l_ops.l_set_tls(l->l_data, cfg)); } -int +nng_err nni_listener_set_security_descriptor(nni_listener *l, void *desc) { if (l->l_ops.l_set_security_descriptor == NULL) { diff --git a/src/core/listener.h b/src/core/listener.h index e1f83685..8b9a4c03 100644 --- a/src/core/listener.h +++ b/src/core/listener.h @@ -32,7 +32,7 @@ extern int nni_listener_getopt( nni_listener *, const char *, void *, size_t *, nni_type); extern int nni_listener_get_tls(nni_listener *, nng_tls_config **); extern int nni_listener_set_tls(nni_listener *, nng_tls_config *); -extern int nni_listener_set_security_descriptor(nni_listener *, void *); +extern nng_err nni_listener_set_security_descriptor(nni_listener *, void *); extern nng_url *nni_listener_url(nni_listener *); extern void nni_listener_add_stat(nni_listener *, nni_stat_item *); extern void nni_listener_bump_error(nni_listener *, int); diff --git a/src/core/options.c b/src/core/options.c index 7e05c23e..23e63d1c 100644 --- a/src/core/options.c +++ b/src/core/options.c @@ -16,7 +16,7 @@ #include <stdio.h> #include <string.h> -int +nng_err nni_copyin_ms(nni_duration *dp, const void *v, size_t sz, nni_type t) { nni_duration dur; @@ -33,10 +33,10 @@ nni_copyin_ms(nni_duration *dp, const void *v, size_t sz, nni_type t) if (dp != NULL) { *dp = dur; } - return (0); + return (NNG_OK); } -int +nng_err nni_copyin_bool(bool *bp, const void *v, size_t sz, nni_type t) { NNI_ARG_UNUSED(sz); @@ -45,10 +45,10 @@ nni_copyin_bool(bool *bp, const void *v, size_t sz, nni_type t) return (NNG_EBADTYPE); } *bp = *(bool *) v; - return (0); + return (NNG_OK); } -int +nng_err nni_copyin_int( int *ip, const void *v, size_t sz, int minv, int maxv, nni_type t) { @@ -66,10 +66,10 @@ nni_copyin_int( return (NNG_EINVAL); } *ip = i; - return (0); + return (NNG_OK); } -int +nng_err nni_copyin_size( size_t *sp, const void *v, size_t sz, size_t minv, size_t maxv, nni_type t) { @@ -85,10 +85,10 @@ nni_copyin_size( return (NNG_EINVAL); } *sp = val; - return (0); + return (NNG_OK); } -int +nng_err nni_copyin_str(char *s, const void *v, size_t maxsz, nni_type t) { size_t z; @@ -102,20 +102,20 @@ nni_copyin_str(char *s, const void *v, size_t maxsz, nni_type t) } memcpy(s, v, z); s[z] = 0; - return (0); + return (NNG_OK); } -int +nng_err nni_copyin_sockaddr(nng_sockaddr *ap, const void *v, nni_type t) { if (t != NNI_TYPE_SOCKADDR) { return (NNG_EBADTYPE); } *ap = *(nng_sockaddr *) v; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_bool(bool b, void *dst, size_t *szp, nni_type t) { NNI_ARG_UNUSED(szp); @@ -123,10 +123,10 @@ nni_copyout_bool(bool b, void *dst, size_t *szp, nni_type t) return (NNG_EBADTYPE); } *(bool *) dst = b; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_int(int i, void *dst, size_t *szp, nni_type t) { NNI_ARG_UNUSED(szp); @@ -134,10 +134,10 @@ nni_copyout_int(int i, void *dst, size_t *szp, nni_type t) return (NNG_EBADTYPE); } *(int *) dst = i; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_ms(nng_duration d, void *dst, size_t *szp, nni_type t) { NNI_ARG_UNUSED(szp); @@ -145,10 +145,10 @@ nni_copyout_ms(nng_duration d, void *dst, size_t *szp, nni_type t) return (NNG_EBADTYPE); } *(nng_duration *) dst = d; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_size(size_t s, void *dst, size_t *szp, nni_type t) { NNI_ARG_UNUSED(szp); @@ -156,10 +156,10 @@ nni_copyout_size(size_t s, void *dst, size_t *szp, nni_type t) return (NNG_EBADTYPE); } *(size_t *) dst = s; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_sockaddr( const nng_sockaddr *sap, void *dst, size_t *szp, nni_type t) { @@ -168,10 +168,10 @@ nni_copyout_sockaddr( return (NNG_EBADTYPE); } *(nng_sockaddr *) dst = *sap; - return (0); + return (NNG_OK); } -int +nng_err nni_copyout_str(const char *str, void *dst, size_t *szp, nni_type t) { char *s; @@ -184,10 +184,10 @@ nni_copyout_str(const char *str, void *dst, size_t *szp, nni_type t) return (NNG_ENOMEM); } *(char **) dst = s; - return (0); + return (NNG_OK); } -int +nng_err nni_getopt(const nni_option *opts, const char *nm, void *arg, void *buf, size_t *szp, nni_type otype) { @@ -203,7 +203,7 @@ nni_getopt(const nni_option *opts, const char *nm, void *arg, void *buf, return (NNG_ENOTSUP); } -int +nng_err nni_setopt(const nni_option *opts, const char *nm, void *arg, const void *buf, size_t sz, nni_type otype) { diff --git a/src/core/options.h b/src/core/options.h index 71fa4d36..fb326b6a 100644 --- a/src/core/options.h +++ b/src/core/options.h @@ -28,29 +28,29 @@ // in their own option handling, centralizing the logic for dealing with // variable sized options. -extern int nni_copyin_ms(nni_duration *, const void *, size_t, nni_type); -extern int nni_copyin_bool(bool *, const void *, size_t, nni_type); -extern int nni_copyin_int(int *, const void *, size_t, int, int, nni_type); -extern int nni_copyin_size( +extern nng_err nni_copyin_ms(nni_duration *, const void *, size_t, nni_type); +extern nng_err nni_copyin_bool(bool *, const void *, size_t, nni_type); +extern nng_err nni_copyin_int(int *, const void *, size_t, int, int, nni_type); +extern nng_err nni_copyin_size( size_t *, const void *, size_t, size_t, size_t, nni_type); -extern int nni_copyin_str(char *, const void *, size_t, nni_type); -extern int nni_copyin_ptr(void **, const void *, size_t, nni_type); -extern int nni_copyin_sockaddr(nng_sockaddr *, const void *, nni_type); +extern nng_err nni_copyin_str(char *, const void *, size_t, nni_type); +extern nng_err nni_copyin_ptr(void **, const void *, size_t, nni_type); +extern nng_err nni_copyin_sockaddr(nng_sockaddr *, const void *, nni_type); // nni_copyout_xxx copies out a type of the named value. It assumes that // the type is aligned and the size correct. -extern int nni_copyout(const void *, size_t, void *, size_t *); -extern int nni_copyout_bool(bool, void *, size_t *, nni_type); -extern int nni_copyout_int(int, void *, size_t *, nni_type); -extern int nni_copyout_ms(nng_duration, void *, size_t *, nni_type); -extern int nni_copyout_ptr(void *, void *, size_t *, nni_type); -extern int nni_copyout_size(size_t, void *, size_t *, nni_type); -extern int nni_copyout_sockaddr( +extern nng_err nni_copyout(const void *, size_t, void *, size_t *); +extern nng_err nni_copyout_bool(bool, void *, size_t *, nni_type); +extern nng_err nni_copyout_int(int, void *, size_t *, nni_type); +extern nng_err nni_copyout_ms(nng_duration, void *, size_t *, nni_type); +extern nng_err nni_copyout_ptr(void *, void *, size_t *, nni_type); +extern nng_err nni_copyout_size(size_t, void *, size_t *, nni_type); +extern nng_err nni_copyout_sockaddr( const nng_sockaddr *, void *, size_t *, nni_type); // nni_copyout_str copies out a string. If the type is NNI_TYPE_STRING, // then it passes through a pointer, created by nni_strdup(). -extern int nni_copyout_str(const char *, void *, size_t *, nni_type); +extern nng_err nni_copyout_str(const char *, void *, size_t *, nni_type); // nni_option is used for socket, protocol, transport, and similar options. // Note that only for transports, the o_set member may be called with a NULL @@ -66,20 +66,20 @@ struct nni_option_s { // the actual size of the object that would have been copied // is supplied by the function in the size. If the object did // not fit, then NNG_EINVAL is returned. - int (*o_get)(void *, void *, size_t *, nni_type); + nng_err (*o_get)(void *, void *, size_t *, nni_type); // o_set is used to set the value of the option. For transport // endpoints only, the instance parameter (first argument) may be // NULL, in which case only a generic validation of the parameters // is performed. (This is used when setting socket options before - int (*o_set)(void *, const void *, size_t, nni_type); + nng_err (*o_set)(void *, const void *, size_t, nni_type); }; // nni_getopt and nni_setopt are helper functions to implement options // based on arrays of nni_option structures. -extern int nni_getopt( +extern nng_err nni_getopt( const nni_option *, const char *, void *, void *, size_t *, nni_type); -extern int nni_setopt( +extern nng_err nni_setopt( const nni_option *, const char *, void *, const void *, size_t, nni_type); #endif // CORE_OPTIONS_H diff --git a/src/core/pollable.c b/src/core/pollable.c index 8e5ad7c1..d07c9b10 100644 --- a/src/core/pollable.c +++ b/src/core/pollable.c @@ -14,7 +14,7 @@ // atomically and use nni_atomic_cas64, to be lock free. #define WFD(fds) ((int) ((fds) &0xffffffffu)) #define RFD(fds) ((int) (((fds) >> 32u) & 0xffffffffu)) -#define FD_JOIN(wfd, rfd) ((uint64_t)(wfd) + ((uint64_t)(rfd) << 32u)) +#define FD_JOIN(wfd, rfd) ((uint64_t) (wfd) + ((uint64_t) (rfd) << 32u)) void nni_pollable_init(nni_pollable *p) @@ -60,7 +60,7 @@ nni_pollable_clear(nni_pollable *p) } } -int +nng_err nni_pollable_getfd(nni_pollable *p, int *fdp) { if (p == NULL) { @@ -75,7 +75,7 @@ nni_pollable_getfd(nni_pollable *p, int *fdp) if ((fds = nni_atomic_get64(&p->p_fds)) != (uint64_t) -1) { *fdp = RFD(fds); - return (0); + return (NNG_OK); } if ((rv = nni_plat_pipe_open(&wfd, &rfd)) != 0) { return (rv); @@ -87,7 +87,7 @@ nni_pollable_getfd(nni_pollable *p, int *fdp) nni_plat_pipe_raise(wfd); } *fdp = rfd; - return (0); + return (NNG_OK); } // Someone beat us. Close ours, and try again. diff --git a/src/core/pollable.h b/src/core/pollable.h index 099ab8b7..1be8b034 100644 --- a/src/core/pollable.h +++ b/src/core/pollable.h @@ -16,9 +16,9 @@ typedef struct nni_pollable nni_pollable; -extern void nni_pollable_raise(nni_pollable *); -extern void nni_pollable_clear(nni_pollable *); -extern int nni_pollable_getfd(nni_pollable *, int *); +extern void nni_pollable_raise(nni_pollable *); +extern void nni_pollable_clear(nni_pollable *); +extern nng_err nni_pollable_getfd(nni_pollable *, int *); // nni_pollable implementation details are private. Only here for inlining. // We have joined the write and read file descriptors into a single diff --git a/src/core/protocol.h b/src/core/protocol.h index 5231c8f4..109ec5ef 100644 --- a/src/core/protocol.h +++ b/src/core/protocol.h @@ -109,10 +109,10 @@ struct nni_proto_sock_ops { void (*sock_recv)(void *, nni_aio *); // Return the receive poll FD. - int (*sock_recv_poll_fd)(void *, int *); + nng_err (*sock_recv_poll_fd)(void *, int *); // Return the send poll FD. - int (*sock_send_poll_fd)(void *, int *); + nng_err (*sock_send_poll_fd)(void *, int *); // Options. Must not be NULL. Final entry should have NULL name. nni_option *sock_options; diff --git a/src/core/socket.c b/src/core/socket.c index 0dfdb183..0e2e72ea 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -153,80 +153,80 @@ sock_get_fd(nni_sock *s, unsigned flag, int *fdp) return (rv); } -static int +static nng_err sock_set_recvtimeo(void *s, const void *buf, size_t sz, nni_type t) { return (nni_copyin_ms(&SOCK(s)->s_rcvtimeo, buf, sz, t)); } -static int +static nng_err sock_get_recvtimeo(void *s, void *buf, size_t *szp, nni_type t) { return (nni_copyout_ms(SOCK(s)->s_rcvtimeo, buf, szp, t)); } -static int +static nng_err sock_set_sendtimeo(void *s, const void *buf, size_t sz, nni_type t) { return (nni_copyin_ms(&SOCK(s)->s_sndtimeo, buf, sz, t)); } -static int +static nng_err sock_get_sendtimeo(void *s, void *buf, size_t *szp, nni_type t) { return (nni_copyout_ms(SOCK(s)->s_sndtimeo, buf, szp, t)); } -static int +static nng_err sock_set_reconnmint(void *s, const void *buf, size_t sz, nni_type t) { return (nni_copyin_ms(&SOCK(s)->s_reconn, buf, sz, t)); } -static int +static nng_err sock_get_reconnmint(void *s, void *buf, size_t *szp, nni_type t) { return (nni_copyout_ms(SOCK(s)->s_reconn, buf, szp, t)); } -static int +static nng_err sock_set_reconnmaxt(void *s, const void *buf, size_t sz, nni_type t) { return (nni_copyin_ms(&SOCK(s)->s_reconnmax, buf, sz, t)); } -static int +static nng_err sock_get_reconnmaxt(void *s, void *buf, size_t *szp, nni_type t) { return (nni_copyout_ms(SOCK(s)->s_reconnmax, buf, szp, t)); } -static int +static nng_err sock_set_recvmaxsz(void *s, const void *buf, size_t sz, nni_type t) { return ( nni_copyin_size(&SOCK(s)->s_rcvmaxsz, buf, sz, 0, NNI_MAXSZ, t)); } -static int +static nng_err sock_get_recvmaxsz(void *s, void *buf, size_t *szp, nni_type t) { return (nni_copyout_size(SOCK(s)->s_rcvmaxsz, buf, szp, t)); } -static int +static nng_err sock_set_recvbuf(void *s, const void *buf, size_t sz, nni_type t) { - int len; - int rv; + int len; + nng_err rv; - if ((rv = nni_copyin_int(&len, buf, sz, 0, 8192, t)) != 0) { + if ((rv = nni_copyin_int(&len, buf, sz, 0, 8192, t)) != NNG_OK) { return (rv); } return (nni_msgq_resize(SOCK(s)->s_urq, len)); } -static int +static nng_err sock_get_recvbuf(void *s, void *buf, size_t *szp, nni_type t) { int len = nni_msgq_cap(SOCK(s)->s_urq); @@ -234,19 +234,19 @@ sock_get_recvbuf(void *s, void *buf, size_t *szp, nni_type t) return (nni_copyout_int(len, buf, szp, t)); } -static int +static nng_err sock_set_sendbuf(void *s, const void *buf, size_t sz, nni_type t) { - int len; - int rv; + int len; + nng_err rv; - if ((rv = nni_copyin_int(&len, buf, sz, 0, 8192, t)) != 0) { + if ((rv = nni_copyin_int(&len, buf, sz, 0, 8192, t)) != NNG_OK) { return (rv); } return (nni_msgq_resize(SOCK(s)->s_uwq, len)); } -static int +static nng_err sock_get_sendbuf(void *s, void *buf, size_t *szp, nni_type t) { int len = nni_msgq_cap(SOCK(s)->s_uwq); diff --git a/src/core/sockfd.c b/src/core/sockfd.c index 3a43359d..651fcd63 100644 --- a/src/core/sockfd.c +++ b/src/core/sockfd.c @@ -135,15 +135,15 @@ sfd_listener_accept(void *arg, nng_aio *aio) nni_mtx_unlock(&l->mtx); } -static int +static nng_err sfd_listener_set_fd(void *arg, const void *buf, size_t sz, nni_type t) { sfd_listener *l = arg; nni_aio *aio; int fd; - int rv; + nng_err rv; - if ((rv = nni_copyin_int(&fd, buf, sz, 0, NNI_MAXINT, t)) != 0) { + if ((rv = nni_copyin_int(&fd, buf, sz, 0, NNI_MAXINT, t)) != NNG_OK) { return (rv); } @@ -167,10 +167,10 @@ sfd_listener_set_fd(void *arg, const void *buf, size_t sz, nni_type t) } nni_mtx_unlock(&l->mtx); - return (0); + return (NNG_OK); } -static int +static nng_err sfd_listener_get_addr(void *arg, void *buf, size_t *szp, nni_type t) { NNI_ARG_UNUSED(arg); @@ -193,7 +193,7 @@ static const nni_option sfd_listener_options[] = { }, }; -static int +static nng_err sfd_listener_get( void *arg, const char *name, void *buf, size_t *szp, nni_type t) { @@ -201,7 +201,7 @@ sfd_listener_get( return (nni_getopt(sfd_listener_options, name, l, buf, szp, t)); } -static int +static nng_err sfd_listener_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { diff --git a/src/core/stream.c b/src/core/stream.c index d8111c7a..e0da3582 100644 --- a/src/core/stream.c +++ b/src/core/stream.c @@ -150,7 +150,7 @@ nng_stream_recv(nng_stream *s, nng_aio *aio) s->s_recv(s, aio); } -int +nng_err nni_stream_get( nng_stream *s, const char *nm, void *data, size_t *szp, nni_type t) { @@ -187,7 +187,7 @@ nng_stream_dialer_dial(nng_stream_dialer *d, nng_aio *aio) d->sd_dial(d, aio); } -int +nng_err nng_stream_dialer_alloc_url(nng_stream_dialer **dp, const nng_url *url) { for (int i = 0; stream_drivers[i].scheme != NULL; i++) { @@ -198,7 +198,7 @@ nng_stream_dialer_alloc_url(nng_stream_dialer **dp, const nng_url *url) return (NNG_ENOTSUP); } -int +nng_err nng_stream_dialer_alloc(nng_stream_dialer **dp, const char *uri) { nng_url *url; @@ -212,21 +212,21 @@ nng_stream_dialer_alloc(nng_stream_dialer **dp, const char *uri) return (rv); } -int +nng_err nni_stream_dialer_get( nng_stream_dialer *d, const char *nm, void *data, size_t *szp, nni_type t) { return (d->sd_get(d, nm, data, szp, t)); } -int +nng_err nni_stream_dialer_set(nng_stream_dialer *d, const char *nm, const void *data, size_t sz, nni_type t) { return (d->sd_set(d, nm, data, sz, t)); } -int +nng_err nni_stream_dialer_get_tls(nng_stream_dialer *d, nng_tls_config **cfgp) { if (d->sd_get_tls == NULL) { @@ -235,7 +235,7 @@ nni_stream_dialer_get_tls(nng_stream_dialer *d, nng_tls_config **cfgp) return (d->sd_get_tls(d, cfgp)); } -int +nng_err nni_stream_dialer_set_tls(nng_stream_dialer *d, nng_tls_config *cfg) { if (d->sd_set_tls == NULL) { @@ -267,7 +267,7 @@ nng_stream_listener_free(nng_stream_listener *l) l->sl_free(l); } } -int +nng_err nng_stream_listener_listen(nng_stream_listener *l) { return (l->sl_listen(l)); @@ -279,21 +279,21 @@ nng_stream_listener_accept(nng_stream_listener *l, nng_aio *aio) l->sl_accept(l, aio); } -int +nng_err nni_stream_listener_get(nng_stream_listener *l, const char *nm, void *data, size_t *szp, nni_type t) { return (l->sl_get(l, nm, data, szp, t)); } -int +nng_err nni_stream_listener_set(nng_stream_listener *l, const char *nm, const void *data, size_t sz, nni_type t) { return (l->sl_set(l, nm, data, sz, t)); } -int +nng_err nni_stream_listener_get_tls(nng_stream_listener *l, nng_tls_config **cfgp) { if (l->sl_get_tls == NULL) { @@ -302,7 +302,7 @@ nni_stream_listener_get_tls(nng_stream_listener *l, nng_tls_config **cfgp) return (l->sl_get_tls(l, cfgp)); } -int +nng_err nni_stream_listener_set_tls(nng_stream_listener *l, nng_tls_config *cfg) { if (l->sl_set_tls == NULL) { @@ -311,7 +311,7 @@ nni_stream_listener_set_tls(nng_stream_listener *l, nng_tls_config *cfg) return (l->sl_set_tls(l, cfg)); } -int +nng_err nng_stream_listener_set_security_descriptor( nng_stream_listener *l, void *pdesc) { @@ -321,7 +321,7 @@ nng_stream_listener_set_security_descriptor( return (l->sl_set_security_descriptor(l, pdesc)); } -int +nng_err nng_stream_listener_alloc_url(nng_stream_listener **lp, const nng_url *url) { for (int i = 0; stream_drivers[i].scheme != NULL; i++) { @@ -332,13 +332,13 @@ nng_stream_listener_alloc_url(nng_stream_listener **lp, const nng_url *url) return (NNG_ENOTSUP); } -int +nng_err nng_stream_listener_alloc(nng_stream_listener **lp, const char *uri) { nng_url *url; - int rv; + nng_err rv; - if ((rv = nng_url_parse(&url, uri)) != 0) { + if ((rv = nng_url_parse(&url, uri)) != NNG_OK) { return (rv); } rv = nng_stream_listener_alloc_url(lp, url); @@ -348,154 +348,154 @@ nng_stream_listener_alloc(nng_stream_listener **lp, const char *uri) // Public stream options. -int +nng_err nng_stream_get_int(nng_stream *s, const char *n, int *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_INT32)); } -int +nng_err nng_stream_get_bool(nng_stream *s, const char *n, bool *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_BOOL)); } -int +nng_err nng_stream_get_size(nng_stream *s, const char *n, size_t *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_SIZE)); } -int +nng_err nng_stream_get_string(nng_stream *s, const char *n, char **v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_STRING)); } -int +nng_err nng_stream_get_ms(nng_stream *s, const char *n, nng_duration *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_DURATION)); } -int +nng_err nng_stream_get_addr(nng_stream *s, const char *n, nng_sockaddr *v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_SOCKADDR)); } -int +nng_err nng_stream_dialer_get_int(nng_stream_dialer *d, const char *n, int *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_INT32)); } -int +nng_err nng_stream_dialer_get_bool(nng_stream_dialer *d, const char *n, bool *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_BOOL)); } -int +nng_err nng_stream_dialer_get_size(nng_stream_dialer *d, const char *n, size_t *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_SIZE)); } -int +nng_err nng_stream_dialer_get_string(nng_stream_dialer *d, const char *n, char **v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_STRING)); } -int +nng_err nng_stream_dialer_get_ms(nng_stream_dialer *d, const char *n, nng_duration *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_DURATION)); } -int +nng_err nng_stream_dialer_get_addr( nng_stream_dialer *d, const char *n, nng_sockaddr *v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_SOCKADDR)); } -int +nng_err nng_stream_dialer_get_tls(nng_stream_dialer *d, nng_tls_config **cfgp) { return (nni_stream_dialer_get_tls(d, cfgp)); } -int +nng_err nng_stream_listener_get_int(nng_stream_listener *l, const char *n, int *v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_INT32)); } -int +nng_err nng_stream_listener_get_bool(nng_stream_listener *l, const char *n, bool *v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_BOOL)); } -int +nng_err nng_stream_listener_get_size(nng_stream_listener *l, const char *n, size_t *v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_SIZE)); } -int +nng_err nng_stream_listener_get_string(nng_stream_listener *l, const char *n, char **v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_STRING)); } -int +nng_err nng_stream_listener_get_ms( nng_stream_listener *l, const char *n, nng_duration *v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_DURATION)); } -int +nng_err nng_stream_listener_get_addr( nng_stream_listener *l, const char *n, nng_sockaddr *v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_SOCKADDR)); } -int +nng_err nng_stream_listener_get_tls(nng_stream_listener *l, nng_tls_config **cfgp) { return (nni_stream_listener_get_tls(l, cfgp)); } -int +nng_err nng_stream_dialer_set_int(nng_stream_dialer *d, const char *n, int v) { return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_INT32)); } -int +nng_err nng_stream_dialer_set_bool(nng_stream_dialer *d, const char *n, bool v) { return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_BOOL)); } -int +nng_err nng_stream_dialer_set_size(nng_stream_dialer *d, const char *n, size_t v) { return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_SIZE)); } -int +nng_err nng_stream_dialer_set_ms(nng_stream_dialer *d, const char *n, nng_duration v) { return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_DURATION)); } -int +nng_err nng_stream_dialer_set_string( nng_stream_dialer *d, const char *n, const char *v) { @@ -503,38 +503,38 @@ nng_stream_dialer_set_string( d, n, v, v == NULL ? 0 : strlen(v) + 1, NNI_TYPE_STRING)); } -int +nng_err nng_stream_dialer_set_addr( nng_stream_dialer *d, const char *n, const nng_sockaddr *v) { return (nni_stream_dialer_set(d, n, v, sizeof(*v), NNI_TYPE_SOCKADDR)); } -int +nng_err nng_stream_dialer_set_tls(nng_stream_dialer *d, nng_tls_config *cfg) { return (nni_stream_dialer_set_tls(d, cfg)); } -int +nng_err nng_stream_listener_set_int(nng_stream_listener *l, const char *n, int v) { return (nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_INT32)); } -int +nng_err nng_stream_listener_set_bool(nng_stream_listener *l, const char *n, bool v) { return (nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_BOOL)); } -int +nng_err nng_stream_listener_set_size(nng_stream_listener *l, const char *n, size_t v) { return (nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_SIZE)); } -int +nng_err nng_stream_listener_set_ms( nng_stream_listener *l, const char *n, nng_duration v) { @@ -542,7 +542,7 @@ nng_stream_listener_set_ms( nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_DURATION)); } -int +nng_err nng_stream_listener_set_string( nng_stream_listener *l, const char *n, const char *v) { @@ -550,7 +550,7 @@ nng_stream_listener_set_string( l, n, v, v == NULL ? 0 : strlen(v) + 1, NNI_TYPE_STRING)); } -int +nng_err nng_stream_listener_set_addr( nng_stream_listener *l, const char *n, const nng_sockaddr *v) { @@ -558,7 +558,7 @@ nng_stream_listener_set_addr( nni_stream_listener_set(l, n, v, sizeof(*v), NNI_TYPE_SOCKADDR)); } -int +nng_err nng_stream_listener_set_tls(nng_stream_listener *l, nng_tls_config *cfg) { return (nni_stream_listener_set_tls(l, cfg)); diff --git a/src/core/stream.h b/src/core/stream.h index 5a07e5e5..83c121cd 100644 --- a/src/core/stream.h +++ b/src/core/stream.h @@ -16,25 +16,27 @@ #include "defs.h" // Private property operations (these include the types.) -extern int nni_stream_get( +extern nng_err nni_stream_get( nng_stream *, const char *, void *, size_t *, nni_type); -extern int nni_stream_set( +extern nng_err nni_stream_set( nng_stream *, const char *, const void *, size_t, nni_type); -extern int nni_stream_dialer_get( +extern nng_err nni_stream_dialer_get( nng_stream_dialer *, const char *, void *, size_t *, nni_type); -extern int nni_stream_dialer_set( +extern nng_err nni_stream_dialer_set( nng_stream_dialer *, const char *, const void *, size_t, nni_type); -extern int nni_stream_dialer_set_tls(nng_stream_dialer *, nng_tls_config *); -extern int nni_stream_dialer_get_tls(nng_stream_dialer *, nng_tls_config **); +extern nng_err nni_stream_dialer_set_tls( + nng_stream_dialer *, nng_tls_config *); +extern nng_err nni_stream_dialer_get_tls( + nng_stream_dialer *, nng_tls_config **); -extern int nni_stream_listener_get( +extern nng_err nni_stream_listener_get( nng_stream_listener *, const char *, void *, size_t *, nni_type); -extern int nni_stream_listener_set( +extern nng_err nni_stream_listener_set( nng_stream_listener *, const char *, const void *, size_t, nni_type); -extern int nni_stream_listener_set_tls( +extern nng_err nni_stream_listener_set_tls( nng_stream_listener *, nng_tls_config *); -extern int nni_stream_listener_get_tls( +extern nng_err nni_stream_listener_get_tls( nng_stream_listener *, nng_tls_config **); // This is the common implementation of a connected byte stream. It should be @@ -46,8 +48,8 @@ struct nng_stream { void (*s_stop)(void *); void (*s_recv)(void *, nng_aio *); void (*s_send)(void *, nng_aio *); - int (*s_get)(void *, const char *, void *, size_t *, nni_type); - int (*s_set)(void *, const char *, const void *, size_t, nni_type); + nng_err (*s_get)(void *, const char *, void *, size_t *, nni_type); + nng_err (*s_set)(void *, const char *, const void *, size_t, nni_type); }; // Dialer implementation. Stream dialers create streams. @@ -56,10 +58,11 @@ struct nng_stream_dialer { void (*sd_close)(void *); void (*sd_stop)(void *); void (*sd_dial)(void *, nng_aio *); - int (*sd_get)(void *, const char *, void *, size_t *, nni_type); - int (*sd_set)(void *, const char *, const void *, size_t, nni_type); - int (*sd_get_tls)(void *, nng_tls_config **); - int (*sd_set_tls)(void *, nng_tls_config *); + nng_err (*sd_get)(void *, const char *, void *, size_t *, nni_type); + nng_err (*sd_set)( + void *, const char *, const void *, size_t, nni_type); + nng_err (*sd_get_tls)(void *, nng_tls_config **); + nng_err (*sd_set_tls)(void *, nng_tls_config *); }; // Listener implementation. Stream listeners accept connections and create @@ -70,11 +73,12 @@ struct nng_stream_listener { void (*sl_stop)(void *); nng_err (*sl_listen)(void *); void (*sl_accept)(void *, nng_aio *); - int (*sl_get)(void *, const char *, void *, size_t *, nni_type); - int (*sl_set)(void *, const char *, const void *, size_t, nni_type); - int (*sl_get_tls)(void *, nng_tls_config **); - int (*sl_set_tls)(void *, nng_tls_config *); - int (*sl_set_security_descriptor)(void *, void *); + nng_err (*sl_get)(void *, const char *, void *, size_t *, nni_type); + nng_err (*sl_set)( + void *, const char *, const void *, size_t, nni_type); + nng_err (*sl_get_tls)(void *, nng_tls_config **); + nng_err (*sl_set_tls)(void *, nng_tls_config *); + nng_err (*sl_set_security_descriptor)(void *, void *); }; #endif // CORE_STREAM_H diff --git a/src/core/tcp.c b/src/core/tcp.c index 2017452b..5f663c19 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -204,14 +204,14 @@ tcp_dialer_dial(void *arg, nng_aio *aio) nni_mtx_unlock(&d->mtx); } -static int +static nng_err tcp_dialer_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t) { tcp_dialer *d = arg; return (nni_tcp_dialer_get(d->d, name, buf, szp, t)); } -static int +static nng_err tcp_dialer_set( void *arg, const char *name, const void *buf, size_t sz, nni_type t) { |