aboutsummaryrefslogtreecommitdiff
path: root/src/transport/tls
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-01-01 22:12:07 -0800
committerGarrett D'Amore <garrett@damore.org>2018-01-01 22:12:07 -0800
commit1e945e873d3bd791354dec504e42025502c6042f (patch)
tree8c7aafedabd36bb0ecb65da68acf8818aba78aa1 /src/transport/tls
parent7e83c78ad2c98a7c32a1b9557deaa13723e75b02 (diff)
downloadnng-1e945e873d3bd791354dec504e42025502c6042f.tar.gz
nng-1e945e873d3bd791354dec504e42025502c6042f.tar.bz2
nng-1e945e873d3bd791354dec504e42025502c6042f.zip
Fix HTTP sconn race, and compile bugs introduced.
Diffstat (limited to 'src/transport/tls')
-rw-r--r--src/transport/tls/tls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index f2ca6d35..1104d4b2 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -589,7 +589,7 @@ nni_tls_ep_fini(void *arg)
nni_plat_tcp_ep_fini(ep->tep);
}
if (ep->cfg) {
- nng_tls_config_fini(ep->cfg);
+ nni_tls_config_fini(ep->cfg);
}
nni_aio_fini(ep->aio);
nni_mtx_fini(&ep->mtx);
@@ -684,7 +684,7 @@ nni_tls_ep_init(void **epp, const char *url, nni_sock *sock, int mode)
}
if (((rv = nni_plat_tcp_ep_init(&ep->tep, &lsa, &rsa, mode)) != 0) ||
- ((rv = nng_tls_config_init(&ep->cfg, tlsmode)) != 0) ||
+ ((rv = nni_tls_config_init(&ep->cfg, tlsmode)) != 0) ||
((rv = nng_tls_config_auth_mode(ep->cfg, authmode)) != 0) ||
((rv = nni_aio_init(&ep->aio, nni_tls_ep_cb, ep)) != 0)) {
nni_strfree(rhost);
@@ -887,7 +887,7 @@ tls_setopt_config(void *arg, const void *data, size_t sz)
nni_tls_config_hold(cfg);
ep->cfg = cfg;
if (old != NULL) {
- nng_tls_config_fini(old);
+ nni_tls_config_fini(old);
}
return (0);
}