diff --git a/transports/janus_websockets.c b/transports/janus_websockets.c index 672b3e9ea4..4d2b8e3486 100644 --- a/transports/janus_websockets.c +++ b/transports/janus_websockets.c @@ -636,7 +636,9 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi info.ssl_private_key_password = NULL; info.gid = -1; info.uid = -1; - info.options = 0; +#if (LWS_LIBRARY_VERSION_MAJOR == 3 && LWS_LIBRARY_VERSION_MINOR >= 2) || (LWS_LIBRARY_VERSION_MAJOR > 3) + info.options = LWS_SERVER_OPTION_FAIL_UPON_UNABLE_TO_BIND; +#endif /* Create the WebSocket context */ wss = lws_create_vhost(wsc, &info); if(wss == NULL) { @@ -701,10 +703,10 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi info.ssl_cipher_list = ciphers; info.gid = -1; info.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 2 +#if (LWS_LIBRARY_VERSION_MAJOR == 3 && LWS_LIBRARY_VERSION_MINOR >= 2) || (LWS_LIBRARY_VERSION_MAJOR > 3) + info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT | LWS_SERVER_OPTION_FAIL_UPON_UNABLE_TO_BIND; +#elif LWS_LIBRARY_VERSION_MAJOR >= 2 info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT; -#else - info.options = 0; #endif /* Create the secure WebSocket context */ swss = lws_create_vhost(wsc, &info); @@ -753,7 +755,9 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi info.ssl_private_key_password = NULL; info.gid = -1; info.uid = -1; - info.options = 0; +#if (LWS_LIBRARY_VERSION_MAJOR == 3 && LWS_LIBRARY_VERSION_MINOR >= 2) || (LWS_LIBRARY_VERSION_MAJOR > 3) + info.options = LWS_SERVER_OPTION_FAIL_UPON_UNABLE_TO_BIND; +#endif /* Create the WebSocket context */ admin_wss = lws_create_vhost(wsc, &info); if(admin_wss == NULL) { @@ -818,10 +822,10 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi info.ssl_cipher_list = ciphers; info.gid = -1; info.uid = -1; -#if LWS_LIBRARY_VERSION_MAJOR >= 2 +#if (LWS_LIBRARY_VERSION_MAJOR == 3 && LWS_LIBRARY_VERSION_MINOR >= 2) || (LWS_LIBRARY_VERSION_MAJOR > 3) + info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT | LWS_SERVER_OPTION_FAIL_UPON_UNABLE_TO_BIND; +#elif LWS_LIBRARY_VERSION_MAJOR >= 2 info.options = LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT; -#else - info.options = 0; #endif /* Create the secure WebSocket context */ admin_swss = lws_create_vhost(wsc, &info);