mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -536,6 +536,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1026,7 +1027,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;
|
||||
}
|
||||
|
||||
@@ -3955,7 +3956,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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user