From 4dca974cc138a7298128fcd17db6e1c9cb615998 Mon Sep 17 00:00:00 2001 From: bossiel Date: Mon, 12 Nov 2012 10:56:50 +0000 Subject: [PATCH] - Always update rtcp-mux attribute when remote sdp is received - make sure to stop ICE engine even if RTP manager is not started --- branches/2.0/doubango/tinyDAV/src/tdav_session_av.c | 5 ++++- branches/2.0/doubango/tinyRTP/src/trtp_manager.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c b/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c index 33cc764e..3346f694 100644 --- a/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c +++ b/branches/2.0/doubango/tinyDAV/src/tdav_session_av.c @@ -685,7 +685,10 @@ int tdav_session_av_set_ro(tdav_session_av_t* self, const struct tsdp_header_M_s self->remote_port = m->port; /* RTCP-MUX */ - self->use_rtcpmux = (tsdp_header_M_findA(m, "rtcp-mux") != tsk_null); + self->use_rtcpmux &= (tsdp_header_M_findA(m, "rtcp-mux") != tsk_null); + if(self->ice_ctx){ + tnet_ice_ctx_set_rtcpmux(self->ice_ctx, self->use_rtcpmux); + } /* SDPCapNeg: RFC 5939 */ { diff --git a/branches/2.0/doubango/tinyRTP/src/trtp_manager.c b/branches/2.0/doubango/tinyRTP/src/trtp_manager.c index 3bfc474e..8d6fbeec 100644 --- a/branches/2.0/doubango/tinyRTP/src/trtp_manager.c +++ b/branches/2.0/doubango/tinyRTP/src/trtp_manager.c @@ -829,8 +829,8 @@ int trtp_manager_stop(trtp_manager_t* self) return -1; } - if(!self->is_started){ - return 0; + if(self->ice_ctx){ + ret = tnet_ice_ctx_stop(self->ice_ctx); } // Stop the RTCP session first (will send BYE)