aboutsummaryrefslogtreecommitdiff
path: root/src/transport/tls
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-11-05 17:21:34 -0800
committerGarrett D'Amore <garrett@damore.org>2018-11-05 18:09:35 -0800
commit3cc0bb37e3543052f336abe1d3349ff095f72ae2 (patch)
tree048163a5c66029c4837be4ac93a56f0790df8dc4 /src/transport/tls
parent77984b14a65c0a7387c97f3d36f947dd17358744 (diff)
downloadnng-3cc0bb37e3543052f336abe1d3349ff095f72ae2.tar.gz
nng-3cc0bb37e3543052f336abe1d3349ff095f72ae2.tar.bz2
nng-3cc0bb37e3543052f336abe1d3349ff095f72ae2.zip
fixes #456 TLS configuration object hold
fixes #776 Configuration of mbedTLS should warn about license
Diffstat (limited to 'src/transport/tls')
-rw-r--r--src/transport/tls/tls.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index 8fd59fd7..a8f196f7 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -1149,10 +1149,14 @@ tlstran_ep_set_config(void *arg, const void *data, size_t sz, nni_opt_type t)
static int
tlstran_ep_get_config(void *arg, void *v, size_t *szp, nni_opt_type t)
{
- tlstran_ep *ep = arg;
- int rv;
+ tlstran_ep * ep = arg;
+ nng_tls_config *cfg;
+ int rv;
nni_mtx_lock(&ep->mtx);
- rv = nni_copyout_ptr(ep->cfg, v, szp, t);
+ if ((cfg = ep->cfg) != NULL) {
+ nni_tls_config_hold(cfg);
+ }
+ rv = nni_copyout_ptr(cfg, v, szp, t);
nni_mtx_unlock(&ep->mtx);
return (rv);
}