aboutsummaryrefslogtreecommitdiff
path: root/tests/tls.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-12-31 13:31:02 -0800
committerGarrett D'Amore <garrett@damore.org>2017-12-31 13:31:02 -0800
commit7df0165712bb6ca623830ac55c548696c83e8647 (patch)
tree397de6a93a7d638331b71d1c40c9b89b21487b39 /tests/tls.c
parent772e16dd93d61d8cb9bce2d2e8b88ab42366f725 (diff)
downloadnng-7df0165712bb6ca623830ac55c548696c83e8647.tar.gz
nng-7df0165712bb6ca623830ac55c548696c83e8647.tar.bz2
nng-7df0165712bb6ca623830ac55c548696c83e8647.zip
Rename config init/fini to alloc/free, add documentation for them.
Diffstat (limited to 'tests/tls.c')
-rw-r--r--tests/tls.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/tls.c b/tests/tls.c
index 70b22fea..fe8aea1e 100644
--- a/tests/tls.c
+++ b/tests/tls.c
@@ -110,7 +110,7 @@ init_dialer_tls(trantest *tt, nng_dialer d)
nng_tls_config *cfg;
int rv;
- if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_CLIENT)) != 0) {
+ if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_CLIENT)) != 0) {
return (rv);
}
if ((rv = nng_tls_config_ca_cert(
@@ -124,7 +124,7 @@ init_dialer_tls(trantest *tt, nng_dialer d)
rv = nng_dialer_setopt_ptr(d, NNG_OPT_TLS_CONFIG, cfg);
out:
- nng_tls_config_fini(cfg);
+ nng_tls_config_free(cfg);
return (rv);
}
@@ -134,25 +134,23 @@ init_listener_tls(trantest *tt, nng_listener l)
nng_tls_config *cfg;
int rv;
- if ((rv = nng_tls_config_init(&cfg, NNG_TLS_MODE_SERVER)) != 0) {
+ if ((rv = nng_tls_config_alloc(&cfg, NNG_TLS_MODE_SERVER)) != 0) {
return (rv);
}
if ((rv = nng_tls_config_cert(
cfg, (void *) server_cert, sizeof(server_cert))) != 0) {
- nng_tls_config_fini(cfg);
- return (rv);
+ goto out;
}
if ((rv = nng_tls_config_key(
cfg, (void *) server_key, sizeof(server_key))) != 0) {
- nng_tls_config_fini(cfg);
- return (rv);
+ goto out;
}
if ((rv = nng_listener_setopt_ptr(l, NNG_OPT_TLS_CONFIG, cfg)) != 0) {
- nng_tls_config_fini(cfg);
- return (rv);
+ goto out;
}
- nng_tls_config_fini(cfg);
+out:
+ nng_tls_config_free(cfg);
return (0);
}