[asterisk-commits] dvossel: branch 1.6.0 r176359 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Feb 16 17:46:48 2009
New Revision: 176359

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176359
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=176359&r1=176358&r2=176359
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon Feb 16 17:46:48 2009
@@ -4056,10 +4056,11 @@
 		}
 		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.
 			 */