From: Joshua Colp <jcolp@digium.com>
Date: Thu, 28 Feb 2013 21:58:55 +0000 (+0000)
Subject: While the ICE negotiation is occurring leave strictrtp in an open state, media can... 
X-Git-Tag: 11.4.0-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a78bb96d94445dd9154b5d825825ca04cab04eae;p=thirdparty%2Fasterisk.git

While the ICE negotiation is occurring leave strictrtp in an open state, media can and will come from different places.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@382298 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 82936d209f..4d9940f676 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -540,6 +540,7 @@ static void ast_rtp_ice_start(struct ast_rtp_instance *instance)
 		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 @@ static void ast_rtp_on_ice_complete(pj_ice_sess *ice, pj_status_t status)
 {
 	struct ast_rtp *rtp = ice->user_data;
 
-	if (status != PJ_SUCCESS || !strictrtp) {
+	if (!strictrtp) {
 		return;
 	}
 
@@ -3917,7 +3918,7 @@ static void ast_rtp_remote_address_set(struct ast_rtp_instance *instance, struct
 
 	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);
 	}