diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 23:46:48 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-16 23:46:48 +0000 |
| commit | fb6dfea572c91c36e7b2f9fde135f29c21f3b06c (patch) | |
| tree | 680228ae64f42bbf9a9e4c35e42df1d3de2292a2 | |
| parent | f804a82283028ee8c8a6d4bc8efb91c9dc3480f3 (diff) | |
Merged revisions 176355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r176355 | dvossel | 2009-02-16 17:33:55 -0600 (Mon, 16 Feb 2009) | 13 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@176359 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 c2beb0ad8..a5447022d 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4056,10 +4056,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. */ |