[Pkg-voip-commits] [janus] 101/163: Make sure there's only one a=end-of-candidates per m-line (fixes #995)

[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 2af62019d1f21d410104c71698eb122b8d6b58c7
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Sep 7 14:45:01 2017 +0200

    Make sure there's only one a=end-of-candidates per m-line (fixes #995)
---
 ice.c | 5 -----
 sdp.c | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ice.c b/ice.c
index a100cf5..4247a9d 100644
--- a/ice.c
+++ b/ice.c
@@ -2662,11 +2662,6 @@ void janus_ice_candidates_to_sdp(janus_ice_handle *handle, janus_sdp_mline *mlin
 		}
 		nice_candidate_free(c);
 	}
-	/* Since we're half-trickling, we need to notify the peer that these are all the
-	 * candidates we have for this media stream, via an end-of-candidates attribute:
-	 * https://tools.ietf.org/html/draft-ietf-mmusic-trickle-ice-02#section-4.1 */
-	janus_sdp_attribute *end = janus_sdp_attribute_create("end-of-candidates", NULL);
-	mline->attributes = g_list_append(mline->attributes, end);
 	/* Done */
 	g_slist_free(candidates);
 }
diff --git a/sdp.c b/sdp.c
index c72366c..55897e7 100644
--- a/sdp.c
+++ b/sdp.c
@@ -1050,6 +1050,11 @@ char *janus_sdp_merge(void *ice_handle, janus_sdp *anon) {
 		if(!janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_RTCPMUX) &&
 				(m->type == JANUS_SDP_AUDIO || m->type == JANUS_SDP_VIDEO))
 			janus_ice_candidates_to_sdp(handle, m, stream->stream_id, 2);
+		/* Since we're half-trickling, we need to notify the peer that these are all the
+		 * candidates we have for this media stream, via an end-of-candidates attribute:
+		 * https://tools.ietf.org/html/draft-ietf-mmusic-trickle-ice-02#section-4.1 */
+		janus_sdp_attribute *end = janus_sdp_attribute_create("end-of-candidates", NULL);
+		m->attributes = g_list_append(m->attributes, end);
 		/* Next */
 		temp = temp->next;
 	}

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