From 03f812ccb2876aacd10e589f996b5ec9e0133d5b Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 27 Apr 2025 22:02:04 -0700 Subject: More nng_err -- this time for dialer and listener allocations. --- src/supplemental/tls/tls_api.h | 4 ++-- src/supplemental/tls/tls_dialer.c | 9 +++++---- src/supplemental/tls/tls_listener.c | 9 +++++---- src/supplemental/websocket/websocket.c | 12 ++++++------ src/supplemental/websocket/websocket.h | 4 ++-- 5 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src/supplemental') diff --git a/src/supplemental/tls/tls_api.h b/src/supplemental/tls/tls_api.h index 83256593..1cea7914 100644 --- a/src/supplemental/tls/tls_api.h +++ b/src/supplemental/tls/tls_api.h @@ -16,7 +16,7 @@ // The implementation supplies this function to create the TLS connection // object. All fields will be zeroed. -extern int nni_tls_dialer_alloc(nng_stream_dialer **, const nng_url *); -extern int nni_tls_listener_alloc(nng_stream_listener **, const nng_url *); +extern nng_err nni_tls_dialer_alloc(nng_stream_dialer **, const nng_url *); +extern nng_err nni_tls_listener_alloc(nng_stream_listener **, const nng_url *); #endif // NNG_SUPPLEMENTAL_TLS_TLS_API_H diff --git a/src/supplemental/tls/tls_dialer.c b/src/supplemental/tls/tls_dialer.c index 7f547839..5927edd8 100644 --- a/src/supplemental/tls/tls_dialer.c +++ b/src/supplemental/tls/tls_dialer.c @@ -144,11 +144,11 @@ tls_dialer_set( return (nni_stream_dialer_set(d->d, name, buf, sz, t)); } -int +nng_err nni_tls_dialer_alloc(nng_stream_dialer **dp, const nng_url *url) { tls_dialer *d; - int rv; + nng_err rv; nng_url my_url; memcpy(&my_url, url, sizeof(my_url)); @@ -161,12 +161,13 @@ nni_tls_dialer_alloc(nng_stream_dialer **dp, const nng_url *url) } nni_mtx_init(&d->lk); - if ((rv = nng_stream_dialer_alloc_url(&d->d, &my_url)) != 0) { + if ((rv = nng_stream_dialer_alloc_url(&d->d, &my_url)) != NNG_OK) { nni_mtx_fini(&d->lk); NNI_FREE_STRUCT(d); return (rv); } - if ((rv = nng_tls_config_alloc(&d->cfg, NNG_TLS_MODE_CLIENT)) != 0) { + if ((rv = nng_tls_config_alloc(&d->cfg, NNG_TLS_MODE_CLIENT)) != + NNG_OK) { nng_stream_dialer_free(d->d); nni_mtx_fini(&d->lk); NNI_FREE_STRUCT(d); diff --git a/src/supplemental/tls/tls_listener.c b/src/supplemental/tls/tls_listener.c index 07cdbda6..b16877b1 100644 --- a/src/supplemental/tls/tls_listener.c +++ b/src/supplemental/tls/tls_listener.c @@ -151,11 +151,11 @@ tls_listener_set( return (nni_stream_listener_set(l->l, name, buf, sz, t)); } -int +nng_err nni_tls_listener_alloc(nng_stream_listener **lp, const nng_url *url) { tls_listener *l; - int rv; + nng_err rv; nng_url my_url; memcpy(&my_url, url, sizeof(my_url)); @@ -169,12 +169,13 @@ nni_tls_listener_alloc(nng_stream_listener **lp, const nng_url *url) } nni_mtx_init(&l->lk); - if ((rv = nng_stream_listener_alloc_url(&l->l, &my_url)) != 0) { + if ((rv = nng_stream_listener_alloc_url(&l->l, &my_url)) != NNG_OK) { nni_mtx_fini(&l->lk); NNI_FREE_STRUCT(l); return (rv); } - if ((rv = nng_tls_config_alloc(&l->cfg, NNG_TLS_MODE_SERVER)) != 0) { + if ((rv = nng_tls_config_alloc(&l->cfg, NNG_TLS_MODE_SERVER)) != + NNG_OK) { nng_stream_listener_free(l->l); nni_mtx_fini(&l->lk); NNI_FREE_STRUCT(l); diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 0f5c6598..b3410dea 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -1998,11 +1998,11 @@ ws_listener_set_tls(void *arg, nng_tls_config *cfg) return (nni_http_server_set_tls(l->server, cfg)); } -int +nng_err nni_ws_listener_alloc(nng_stream_listener **wslp, const nng_url *url) { nni_ws_listener *l; - int rv; + nng_err rv; char *host; if ((l = NNI_ALLOC_STRUCT(l)) == NULL) { @@ -2054,7 +2054,7 @@ nni_ws_listener_alloc(nng_stream_listener **wslp, const nng_url *url) l->ops.sl_get_tls = ws_listener_get_tls; l->ops.sl_set_tls = ws_listener_set_tls; *wslp = (void *) l; - return (0); + return (NNG_OK); } void @@ -2526,11 +2526,11 @@ ws_dialer_set_tls(void *arg, nng_tls_config *cfg) return (nni_http_client_set_tls(d->client, cfg)); } -int +nng_err nni_ws_dialer_alloc(nng_stream_dialer **dp, const nng_url *url) { nni_ws_dialer *d; - int rv; + nng_err rv; if ((d = NNI_ALLOC_STRUCT(d)) == NULL) { return (NNG_ENOMEM); @@ -2564,7 +2564,7 @@ nni_ws_dialer_alloc(nng_stream_dialer **dp, const nng_url *url) d->ops.sd_set_tls = ws_dialer_set_tls; d->ops.sd_get_tls = ws_dialer_get_tls; *dp = (void *) d; - return (0); + return (NNG_OK); } // Dialer does not get a hook chance, as it can examine the request diff --git a/src/supplemental/websocket/websocket.h b/src/supplemental/websocket/websocket.h index 36e8dba5..0fa045d5 100644 --- a/src/supplemental/websocket/websocket.h +++ b/src/supplemental/websocket/websocket.h @@ -33,7 +33,7 @@ typedef struct nni_ws_dialer nni_ws_dialer; // Much of the websocket API is still "private", meaning you should not // rely upon it being around. -extern int nni_ws_listener_alloc(nng_stream_listener **, const nng_url *); -extern int nni_ws_dialer_alloc(nng_stream_dialer **, const nng_url *); +extern nng_err nni_ws_listener_alloc(nng_stream_listener **, const nng_url *); +extern nng_err nni_ws_dialer_alloc(nng_stream_dialer **, const nng_url *); #endif // NNG_SUPPLEMENTAL_WEBSOCKET_WEBSOCKET_H -- cgit v1.2.3-70-g09d2