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

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Feb 16 15:35:07 2009
New Revision: 176250

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176250
Log:
Merged revisions 176248 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r176248 | dvossel | 2009-02-16 15:30:17 -0600 (Mon, 16 Feb 2009) | 11 lines
  
  Merged revisions 175597 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ........
    r175597 | dvossel | 2009-02-13 14:11:55 -0600 (Fri, 13 Feb 2009) | 4 lines
    
    Fixed iax2 key rotation backwards compatibility
    
    Turns key rotation back on by default.  Added bit into encryption IE to indicate whether or not key rotation is supported or not. If it is not supported then it is not enabled, which insures backwards compatibility.  This eliminates the need for the keyrotate option in iax.conf, so it has been removed.  
  ........
................

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=176250&r1=176249&r2=176250
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon Feb 16 15:35:07 2009
@@ -4048,7 +4048,7 @@
 			res = AST_BRIDGE_COMPLETE;
 			break;
 		}
-		if ((f->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS)) {
+		if ((f->frametype == AST_FRAME_CONTROL) && !(flags & AST_BRIDGE_IGNORE_SIGS) && (f->subclass != AST_CONTROL_SRCUPDATE)) {
 			*fo = f;
 			*rc = who;
 			res =  AST_BRIDGE_COMPLETE;