From 524a3f6ec6e1e921c16ff18997ae494cad09f860 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 1 Aug 2021 08:25:58 -0700 Subject: Fix premature transport registration. Mark it deprecated. Originally the idea was to better support having the transports be separate loadable modules. This isn't needed for the builtin transports, so we make the explicit initialization of them deprecated, and document it as such. --- src/sp/transport/ws/websocket.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/sp/transport/ws/websocket.c') diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c index a3f2cd26..7cf9949f 100644 --- a/src/sp/transport/ws/websocket.c +++ b/src/sp/transport/ws/websocket.c @@ -667,14 +667,26 @@ static nni_sp_tran ws6_tran = { .tran_fini = wstran_fini, }; +#ifndef NNG_ELIDE_DEPRECATED int nng_ws_register(void) +{ + return (nni_init()); +} + +int +nng_wss_register(void) +{ + return (nni_init()); +} +#endif + +void +nni_sp_ws_register(void) { nni_sp_tran_register(&ws_tran); nni_sp_tran_register(&ws4_tran); nni_sp_tran_register(&ws6_tran); - - return (0); } #ifdef NNG_TRANSPORT_WSS @@ -706,22 +718,12 @@ static nni_sp_tran wss6_tran = { .tran_fini = wstran_fini, }; -int -nng_wss_register(void) +void +nni_sp_wss_register(void) { nni_sp_tran_register(&wss_tran); nni_sp_tran_register(&wss4_tran); nni_sp_tran_register(&wss6_tran); - - return (0); -} - -#else - -int -nng_wss_register(void) -{ - return (0); } #endif // NNG_TRANSPORT_WSS -- cgit v1.2.3-70-g09d2