diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-04-01 17:48:52 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-04-01 17:48:52 +0000 |
| commit | a8be22f9da906efca51e68c7e3db461629be9cff (patch) | |
| tree | 288599f27df9f662fdeb9c4d4495a764531babdf /channels | |
| parent | dcf4e46d8f0064dd7635763aecaeae9a442766d0 (diff) | |
Merged revisions 112204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r112204 | file | 2008-04-01 14:43:46 -0300 (Tue, 01 Apr 2008) | 4 lines
Do not pass audio until the remote side has indicated they are providing early media, or if the channel has been answered.
(closes issue #11823)
Reported by: SDamm
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@112205 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1982f1fc8..e68718646 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -5647,7 +5647,13 @@ static struct ast_frame *sip_read(struct ast_channel *ast) } } + /* Only allow audio through if they sent progress with SDP, or if the channel is actually answered */ + if (p->invitestate != INV_EARLY_MEDIA && ast->_state != AST_STATE_UP) { + fr = &ast_null_frame; + } + sip_pvt_unlock(p); + return fr; } |