[Pkg-voip-commits] [janus] 117/282: Wait for handle icethread end before scheduling handle destruction.

[Jonas Smedegaard]

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

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

commit a1adf52939ddb765c38e815a34995e939115cbae
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Fri Sep 29 17:36:28 2017 +0200

    Wait for handle icethread end before scheduling handle destruction.
---
 ice.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ice.c b/ice.c
index 2d7df57..610acbe 100644
--- a/ice.c
+++ b/ice.c
@@ -447,6 +447,9 @@ static gboolean janus_ice_handles_check(gpointer user_data) {
 			if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
 				continue;
 			}
+			if(handle->icethread != NULL) {
+				continue;
+			}
 			/* Schedule the ICE handle for deletion */
 			g_hash_table_iter_remove(&iter);
 			GSource *timeout_source = g_timeout_source_new_seconds(3);
@@ -1238,7 +1241,6 @@ void janus_ice_webrtc_hangup(janus_ice_handle *handle, const char *reason) {
 			}
 		}
 	}
-	handle->icethread = NULL;
 }
 
 void janus_ice_webrtc_free(janus_ice_handle *handle) {
@@ -1254,7 +1256,6 @@ void janus_ice_webrtc_free(janus_ice_handle *handle) {
 		g_main_context_unref (handle->icectx);
 		handle->icectx = NULL;
 	}
-	handle->icethread = NULL;
 	if(handle->streams != NULL) {
 		janus_ice_stream_free(handle->streams, handle->audio_stream);
 		handle->audio_stream = NULL;
@@ -2430,6 +2431,7 @@ void *janus_ice_thread(void *data) {
 		janus_ice_webrtc_free(handle);
 	}
 	g_thread_unref(g_thread_self());
+	handle->icethread = NULL;
 	JANUS_LOG(LOG_VERB, "[%"SCNu64"] ICE thread ended!\n", handle->handle_id);
 	return NULL;
 }

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