diff options
| author | David Vossel <dvossel@digium.com> | 2009-02-16 23:33:55 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2009-02-16 23:33:55 +0000 |
| commit | 00b5dcfca45084c0b0a273180177be1f4e0f6cf1 (patch) | |
| tree | ae95fc4e8698dfe8a7e58ef52c0ad75a0a531cfd /channels/chan_iax2.c | |
| parent | 808047d54bbad94eaddb901e8dd68798bbb6e8bd (diff) | |
Merged revisions 176354 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r176354 | dvossel | 2009-02-16 17:30:52 -0600 (Mon, 16 Feb 2009) | 8 lines
Fixes issue with AST_CONTROL_SRCUPDATE not being relayed correctly during bridging
This should have been committed with rev176247, but I missed it. srcupdate frames no longer break out of the native bridge, but are not being sent to the other call leg either. This fixs that.
issue #13749
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@176355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 7cf65811c..4de90b772 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4235,10 +4235,11 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha } other = (who == c0) ? c1 : c0; /* the 'other' channel */ if ((f->frametype == AST_FRAME_VOICE) || - (f->frametype == AST_FRAME_TEXT) || - (f->frametype == AST_FRAME_VIDEO) || - (f->frametype == AST_FRAME_IMAGE) || - (f->frametype == AST_FRAME_DTMF)) { + (f->frametype == AST_FRAME_TEXT) || + (f->frametype == AST_FRAME_VIDEO) || + (f->frametype == AST_FRAME_IMAGE) || + (f->frametype == AST_FRAME_DTMF) || + (f->frametype == AST_FRAME_CONTROL)) { /* monitored dtmf take out of the bridge. * check if we monitor the specific source. */ |