[svn-commits] file: trunk r382299 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Feb 28 15:59:56 2013
New Revision: 382299

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382299
Log:
While the ICE negotiation is occurring leave strictrtp in an open state, media can and will come from different places.
........

Merged revisions 382298 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=382299&r1=382298&r2=382299
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Thu Feb 28 15:59:56 2013
@@ -536,6 +536,7 @@
 		pj_ice_sess_start_check(rtp->ice);
 		pj_timer_heap_poll(timerheap, NULL);
 		rtp->ice_started = 1;
+		rtp->strict_rtp_state = STRICT_RTP_OPEN;
 	}
 }
 
@@ -1026,7 +1027,7 @@
 {
 	struct ast_rtp *rtp = ice->user_data;
 
-	if (status != PJ_SUCCESS || !strictrtp) {
+	if (!strictrtp) {
 		return;
 	}
 
@@ -3955,7 +3956,7 @@
 
 	rtp->rxseqno = 0;
 
-	if (strictrtp) {
+	if (strictrtp && rtp->strict_rtp_state != STRICT_RTP_OPEN) {
 		rtp->strict_rtp_state = STRICT_RTP_LEARN;
 		rtp_learning_seq_init(rtp, rtp->seqno);
 	}