aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental/tls
diff options
context:
space:
mode:
Diffstat (limited to 'src/supplemental/tls')
-rw-r--r--src/supplemental/tls/tls_api.h4
-rw-r--r--src/supplemental/tls/tls_dialer.c9
-rw-r--r--src/supplemental/tls/tls_listener.c9
3 files changed, 12 insertions, 10 deletions
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);