From 1ed4960ea58d50525665e53db378a8e6c9023e35 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 16 Feb 2009 23:57:11 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@176362 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index daa93cf0f1..83c33ee0b4 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4149,10 +4149,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. */