Merged revisions 176354 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Mon, 16 Feb 2009 23:33:55 +0000 (23:33 +0000)
committerDavid Vossel <dvossel@digium.com>
Mon, 16 Feb 2009 23:33:55 +0000 (23:33 +0000)
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

channels/chan_iax2.c

index 7cf6581..4de90b7 100644 (file)
@@ -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.
                         */