[asterisk-commits] dvossel: branch 1.6.0 r243394 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jan 26 18:01:32 2010
New Revision: 243394

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=243394
Log:
Merged revisions 243391 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r243391 | dvossel | 2010-01-26 17:56:57 -0600 (Tue, 26 Jan 2010) | 15 lines
  
  Merged revisions 243390 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r243390 | dvossel | 2010-01-26 17:55:49 -0600 (Tue, 26 Jan 2010) | 9 lines
    
    fixes bug with channel receiving wrong privileges after call parking 
    
    (closes issue #16429)
    Reported by: Yasuhiro Konishi
    Patches:
          features.c.diff uploaded by Yasuhiro Konishi (license 947)
    Tested by: dvossel
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

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

Modified: branches/1.6.0/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/features.c?view=diff&rev=243394&r1=243393&r2=243394
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Tue Jan 26 18:01:32 2010
@@ -3074,8 +3074,12 @@
 		}
 		ast_channel_unlock(peer);
 
+		/* When the datastores for both caller and callee are created, both the callee and caller channels
+		 * use the features_caller flag variable to represent themselves. With that said, the config.features_callee
+		 * flags should be copied from the datastore's caller feature flags regardless if peer was a callee
+		 * or caller. */
 		if (dialfeatures) {
-			ast_copy_flags(&(config.features_callee), dialfeatures->is_caller ? &(dialfeatures->features_caller) : &(dialfeatures->features_callee), AST_FLAGS_ALL);
+			ast_copy_flags(&(config.features_callee), &(dialfeatures->features_caller), AST_FLAGS_ALL);
 		}
 
 		if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLEE) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH)) {