diff options
| author | Garrett D'Amore <garrett@damore.org> | 2021-07-30 17:37:30 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2021-07-31 11:18:28 -0700 |
| commit | 5e5881391bfa6e261ab0f6349a5f12a526e2f293 (patch) | |
| tree | 4e89313b00110a31bfc1736b565b154c81c6f409 /src/sp/transport/tls | |
| parent | 2c3700cce723f964cab23ae1d8b73aaa66702f50 (diff) | |
| download | nng-5e5881391bfa6e261ab0f6349a5f12a526e2f293.tar.gz nng-5e5881391bfa6e261ab0f6349a5f12a526e2f293.tar.bz2 nng-5e5881391bfa6e261ab0f6349a5f12a526e2f293.zip | |
Simplify the SP transport initialization process.
Diffstat (limited to 'src/sp/transport/tls')
| -rw-r--r-- | src/sp/transport/tls/tls.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c index 429440dc..91c0f1c9 100644 --- a/src/sp/transport/tls/tls.c +++ b/src/sp/transport/tls/tls.c @@ -99,10 +99,9 @@ static nni_reap_list tlstran_pipe_reap_list = { .rl_func = tlstran_pipe_fini, }; -static int +static void tlstran_init(void) { - return (0); } static void @@ -688,7 +687,7 @@ tlstran_url_parse_source(nni_url *url, nng_sockaddr *sa, const nni_url *surl) return (0); } - len = (size_t)(semi - url->u_hostname); + len = (size_t) (semi - url->u_hostname); url->u_hostname = semi + 1; if (strcmp(surl->u_scheme, "tls+tcp") == 0) { @@ -1251,7 +1250,6 @@ static nni_sp_listener_ops tlstran_listener_ops = { }; static nni_sp_tran tls_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "tls+tcp", .tran_dialer = &tlstran_dialer_ops, .tran_listener = &tlstran_listener_ops, @@ -1261,7 +1259,6 @@ static nni_sp_tran tls_tran = { }; static nni_sp_tran tls4_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "tls+tcp4", .tran_dialer = &tlstran_dialer_ops, .tran_listener = &tlstran_listener_ops, @@ -1271,7 +1268,6 @@ static nni_sp_tran tls4_tran = { }; static nni_sp_tran tls6_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "tls+tcp6", .tran_dialer = &tlstran_dialer_ops, .tran_listener = &tlstran_listener_ops, @@ -1283,11 +1279,8 @@ static nni_sp_tran tls6_tran = { int nng_tls_register(void) { - int rv; - if (((rv = nni_sp_tran_register(&tls_tran)) != 0) || - ((rv = nni_sp_tran_register(&tls4_tran)) != 0) || - ((rv = nni_sp_tran_register(&tls6_tran)) != 0)) { - return (rv); - } + nni_sp_tran_register(&tls_tran); + nni_sp_tran_register(&tls4_tran); + nni_sp_tran_register(&tls6_tran); return (0); } |