[Pkg-voip-commits] [janus] 112/163: Merge branch 'master' into fix-descriptors-leak

[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 291a43001598a09f5307f7054590d548c5e64a31
Merge: 1f65a11 6b89cea
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Tue Sep 12 17:16:15 2017 +0200

    Merge branch 'master' into fix-descriptors-leak

 Makefile.am                |   4 +-
 ice.c                      |  24 +++++-
 ice.h                      |   5 ++
 janus.c                    |  58 ++++++++++++++
 mainpage.dox               |  45 +++++++++++
 plugins/janus_recordplay.c |   2 +
 plugins/janus_streaming.c  |   9 ++-
 plugins/janus_videoroom.c  |   4 +-
 text2pcap.c                | 185 +++++++++++++++++++++++++++++++++++++++++++++
 text2pcap.h                |  97 ++++++++++++++++++++++++
 10 files changed, 428 insertions(+), 5 deletions(-)

diff --cc ice.c
index 5e8176a,a306fec..7942e94
--- a/ice.c
+++ b/ice.c
@@@ -1104,9 -1104,13 +1104,13 @@@ gint janus_ice_handle_destroy(void *gat
  	/* Notify the plugin that the session's over */
  	plugin_t->destroy_session(handle->app_handle, &error);
  	/* Get rid of the handle now */
+ 	if(g_atomic_int_compare_and_exchange(&handle->dump_packets, 1, 0)) {
+ 		janus_text2pcap_close(handle->text2pcap);
+ 		g_clear_pointer(&handle->text2pcap, janus_text2pcap_free);
+ 	}
  	janus_flags_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_ALERT);
  	janus_flags_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_STOP);
 -	if(handle->iceloop) {
 +	if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
  		if(handle->audio_id > 0) {
  			nice_agent_attach_recv(handle->agent, handle->audio_id, 1, g_main_loop_get_context (handle->iceloop), NULL, NULL);
  			if(!janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_RTCPMUX))

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