[svn-commits] file: branch 11 r382298 - /branches/11/res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Feb 28 15:58:55 2013
New Revision: 382298

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

Modified:
    branches/11/res/res_rtp_asterisk.c

Modified: branches/11/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_rtp_asterisk.c?view=diff&rev=382298&r1=382297&r2=382298
==============================================================================
--- branches/11/res/res_rtp_asterisk.c (original)
+++ branches/11/res/res_rtp_asterisk.c Thu Feb 28 15:58:55 2013
@@ -540,6 +540,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;
 	}
 }
 
@@ -1029,7 +1030,7 @@
 {
 	struct ast_rtp *rtp = ice->user_data;
 
-	if (status != PJ_SUCCESS || !strictrtp) {
+	if (!strictrtp) {
 		return;
 	}
 
@@ -3917,7 +3918,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);
 	}