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/ws/websocket.c | |
| 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/ws/websocket.c')
| -rw-r--r-- | src/sp/transport/ws/websocket.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index 63a54ce2..a3f2cd26 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -548,10 +548,9 @@ wstran_listener_init(void **lp, nng_url *url, nni_listener *listener) return (0); } -static int +static void wstran_init(void) { - return (0); } static void @@ -642,7 +641,6 @@ static nni_sp_listener_ops ws_listener_ops = { }; static nni_sp_tran ws_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "ws", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -652,7 +650,6 @@ static nni_sp_tran ws_tran = { }; static nni_sp_tran ws4_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "ws4", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -662,7 +659,6 @@ static nni_sp_tran ws4_tran = { }; static nni_sp_tran ws6_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "ws6", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -674,12 +670,9 @@ static nni_sp_tran ws6_tran = { int nng_ws_register(void) { - int rv; - if (((rv = nni_sp_tran_register(&ws_tran)) != 0) || - ((rv = nni_sp_tran_register(&ws4_tran)) != 0) || - ((rv = nni_sp_tran_register(&ws6_tran)) != 0)) { - return (rv); - } + nni_sp_tran_register(&ws_tran); + nni_sp_tran_register(&ws4_tran); + nni_sp_tran_register(&ws6_tran); return (0); } @@ -687,7 +680,6 @@ nng_ws_register(void) #ifdef NNG_TRANSPORT_WSS static nni_sp_tran wss_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "wss", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -697,7 +689,6 @@ static nni_sp_tran wss_tran = { }; static nni_sp_tran wss4_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "wss4", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -707,7 +698,6 @@ static nni_sp_tran wss4_tran = { }; static nni_sp_tran wss6_tran = { - .tran_version = NNI_TRANSPORT_VERSION, .tran_scheme = "wss6", .tran_dialer = &ws_dialer_ops, .tran_listener = &ws_listener_ops, @@ -719,12 +709,9 @@ static nni_sp_tran wss6_tran = { int nng_wss_register(void) { - int rv; - if (((rv = nni_sp_tran_register(&wss_tran)) != 0) || - ((rv = nni_sp_tran_register(&wss4_tran)) != 0) || - ((rv = nni_sp_tran_register(&wss6_tran)) != 0)) { - return (rv); - } + nni_sp_tran_register(&wss_tran); + nni_sp_tran_register(&wss4_tran); + nni_sp_tran_register(&wss6_tran); return (0); } |