aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental/tls
diff options
context:
space:
mode:
Diffstat (limited to 'src/supplemental/tls')
-rw-r--r--src/supplemental/tls/tls_dialer.c12
-rw-r--r--src/supplemental/tls/tls_listener.c12
-rw-r--r--src/supplemental/tls/tls_stream.c12
3 files changed, 18 insertions, 18 deletions
diff --git a/src/supplemental/tls/tls_dialer.c b/src/supplemental/tls/tls_dialer.c
index 5927edd8..0b2acee7 100644
--- a/src/supplemental/tls/tls_dialer.c
+++ b/src/supplemental/tls/tls_dialer.c
@@ -92,7 +92,7 @@ tls_dialer_dial(void *arg, nng_aio *aio)
nng_stream_dialer_dial(d->d, &ts->conn_aio);
}
-static int
+static nng_err
tls_dialer_set_tls(void *arg, nng_tls_config *cfg)
{
tls_dialer *d = arg;
@@ -114,20 +114,20 @@ tls_dialer_set_tls(void *arg, nng_tls_config *cfg)
nni_mtx_unlock(&d->lk);
nng_tls_config_free(old);
- return (0);
+ return (NNG_OK);
}
-static int
+static nng_err
tls_dialer_get_tls(void *arg, nng_tls_config **cfg)
{
tls_dialer *d = arg;
nni_mtx_lock(&d->lk);
*cfg = d->cfg;
nni_mtx_unlock(&d->lk);
- return (0);
+ return (NNG_OK);
}
-static int
+static nng_err
tls_dialer_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
tls_dialer *d = arg;
@@ -135,7 +135,7 @@ tls_dialer_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
return (nni_stream_dialer_get(d->d, name, buf, szp, t));
}
-static int
+static nng_err
tls_dialer_set(
void *arg, const char *name, const void *buf, size_t sz, nni_type t)
{
diff --git a/src/supplemental/tls/tls_listener.c b/src/supplemental/tls/tls_listener.c
index 0ab0f57b..5d2d8599 100644
--- a/src/supplemental/tls/tls_listener.c
+++ b/src/supplemental/tls/tls_listener.c
@@ -99,7 +99,7 @@ tls_listener_accept(void *arg, nng_aio *aio)
nng_stream_listener_accept(l->l, &ts->conn_aio);
}
-static int
+static nng_err
tls_listener_set_tls(void *arg, nng_tls_config *cfg)
{
tls_listener *l = arg;
@@ -120,20 +120,20 @@ tls_listener_set_tls(void *arg, nng_tls_config *cfg)
nni_mtx_unlock(&l->lk);
nng_tls_config_free(old);
- return (0);
+ return (NNG_OK);
}
-static int
+static nng_err
tls_listener_get_tls(void *arg, nng_tls_config **cfg)
{
tls_listener *l = arg;
nni_mtx_lock(&l->lk);
*cfg = l->cfg;
nni_mtx_unlock(&l->lk);
- return (0);
+ return (NNG_OK);
}
-static int
+static nng_err
tls_listener_get(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
@@ -142,7 +142,7 @@ tls_listener_get(
return (nni_stream_listener_get(l->l, name, buf, szp, t));
}
-static int
+static nng_err
tls_listener_set(
void *arg, const char *name, const void *buf, size_t sz, nni_type t)
{
diff --git a/src/supplemental/tls/tls_stream.c b/src/supplemental/tls/tls_stream.c
index 7ac8d5b9..8a7f26d8 100644
--- a/src/supplemental/tls/tls_stream.c
+++ b/src/supplemental/tls/tls_stream.c
@@ -134,7 +134,7 @@ tls_stream_conn_cb(void *arg)
nni_aio_finish(ts->user_aio, 0, 0);
}
-static int tls_stream_get(
+static nng_err tls_stream_get(
void *arg, const char *name, void *buf, size_t *szp, nni_type t);
int
@@ -173,7 +173,7 @@ nni_tls_stream_alloc(tls_stream **tsp, nng_tls_config *cfg, nng_aio *user_aio)
return (0);
}
-static int
+static nng_err
tls_get_verified(void *arg, void *buf, size_t *szp, nni_type t)
{
tls_stream *ts = arg;
@@ -181,7 +181,7 @@ tls_get_verified(void *arg, void *buf, size_t *szp, nni_type t)
return (nni_copyout_bool(nni_tls_verified(&ts->conn), buf, szp, t));
}
-static int
+static nng_err
tls_get_peer_cn(void *arg, void *buf, size_t *szp, nni_type t)
{
NNI_ARG_UNUSED(szp);
@@ -192,7 +192,7 @@ tls_get_peer_cn(void *arg, void *buf, size_t *szp, nni_type t)
tls_stream *ts = arg;
*(char **) buf = (char *) nni_tls_peer_cn(&ts->conn);
- return (0);
+ return (NNG_OK);
}
static const nni_option tls_stream_options[] = {
@@ -209,11 +209,11 @@ static const nni_option tls_stream_options[] = {
},
};
-static int
+static nng_err
tls_stream_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
tls_stream *ts = arg;
- int rv;
+ nng_err rv;
if ((rv = nni_stream_get(ts->conn.bio, name, buf, szp, t)) !=
NNG_ENOTSUP) {