[Pkg-voip-commits] [janus] 80/163: Only use new WebSockets ping/pong stuff if libwebsockets >= 2.1

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit f4781e8afcb474fb293fd2a251e896744693f5aa
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Sep 4 10:52:26 2017 +0200

    Only use new WebSockets ping/pong stuff if libwebsockets >= 2.1
---
 transports/janus_websockets.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/transports/janus_websockets.c b/transports/janus_websockets.c
index 6487dcf..3f85475 100644
--- a/transports/janus_websockets.c
+++ b/transports/janus_websockets.c
@@ -472,19 +472,27 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
 		int pingpong_trigger = 0, pingpong_timeout = 0;
 		item = janus_config_get_item_drilldown(config, "general", "pingpong_trigger");
 		if(item && item->value) {
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 			pingpong_trigger = atoi(item->value);
 			if(pingpong_trigger < 0) {
 				JANUS_LOG(LOG_WARN, "Invalid value for pingpong_trigger (%d), ignoring...\n", pingpong_trigger);
 				pingpong_trigger = 0;
 			}
+#else
+			JANUS_LOG(LOG_WARN, "WebSockets ping/pong only supported in libwebsockets >= 2.1\n");
+#endif
 		}
 		item = janus_config_get_item_drilldown(config, "general", "pingpong_timeout");
 		if(item && item->value) {
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 			pingpong_timeout = atoi(item->value);
 			if(pingpong_timeout < 0) {
 				JANUS_LOG(LOG_WARN, "Invalid value for pingpong_timeout (%d), ignoring...\n", pingpong_timeout);
 				pingpong_timeout = 0;
 			}
+#else
+			JANUS_LOG(LOG_WARN, "WebSockets ping/pong only supported in libwebsockets >= 2.1\n");
+#endif
 		}
 		if((pingpong_trigger && !pingpong_timeout) || (!pingpong_trigger && pingpong_timeout)) {
 			JANUS_LOG(LOG_WARN, "pingpong_trigger and pingpong_timeout not both set, ignoring...\n");
@@ -529,10 +537,12 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
 			info.gid = -1;
 			info.uid = -1;
 			info.options = 0;
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 			if(pingpong_trigger > 0 && pingpong_timeout > 0) {
 				info.ws_ping_pong_interval = pingpong_trigger;
 				info.timeout_secs = pingpong_timeout;
 			}
+#endif
 			/* Create the WebSocket context */
 #ifdef HAVE_LIBWEBSOCKETS_NEWAPI
 			wss = lws_create_context(&info);
@@ -598,10 +608,12 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
 #else
 				info.options = 0;
 #endif
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 				if(pingpong_trigger > 0 && pingpong_timeout > 0) {
 					info.ws_ping_pong_interval = pingpong_trigger;
 					info.timeout_secs = pingpong_timeout;
 				}
+#endif
 				/* Create the secure WebSocket context */
 #ifdef HAVE_LIBWEBSOCKETS_NEWAPI
 				swss = lws_create_context(&info);
@@ -655,10 +667,12 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
 			info.gid = -1;
 			info.uid = -1;
 			info.options = 0;
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 			if(pingpong_trigger > 0 && pingpong_timeout > 0) {
 				info.ws_ping_pong_interval = pingpong_trigger;
 				info.timeout_secs = pingpong_timeout;
 			}
+#endif
 			/* Create the WebSocket context */
 #ifdef HAVE_LIBWEBSOCKETS_NEWAPI
 			admin_wss = lws_create_context(&info);
@@ -724,10 +738,12 @@ int janus_websockets_init(janus_transport_callbacks *callback, const char *confi
 #else
 				info.options = 0;
 #endif
+#if LWS_LIBRARY_VERSION_MAJOR >= 2 && LWS_LIBRARY_VERSION_MINOR >= 1
 				if(pingpong_trigger > 0 && pingpong_timeout > 0) {
 					info.ws_ping_pong_interval = pingpong_trigger;
 					info.timeout_secs = pingpong_timeout;
 				}
+#endif
 				/* Create the secure WebSocket context */
 #ifdef HAVE_LIBWEBSOCKETS_NEWAPI
 				admin_swss = lws_create_context(&info);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git