[svn-commits] jpeeler: branch 1.6.0 r228190 - in /branches/1.6.0: ./ apps/app_chanspy.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Thu Nov  5 15:24:08 2009
New Revision: 228190

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

........
  r228189 | jpeeler | 2009-11-05 15:23:06 -0600 (Thu, 05 Nov 2009) | 11 lines
  
  Fix the fix for chanspy option o 
  
  In 224178, I assumed the uploaded patch was correct as it had received positive
  feedback. The flags were being checked in the incorrect location. Upon testing
  the fix this time it was also found that the flags from the dialplan weren't
  being copied to the chanspy_translation_helper.
  
  (closes issue #16167)
  Reported by: marhbere
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c

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

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=228190&r1=228189&r2=228190
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Thu Nov  5 15:24:08 2009
@@ -201,7 +201,7 @@
 		return -1;
 	}
 
-	if (ast_test_flag(chan, OPTION_READONLY)) {
+	if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) {
 		/* Option 'o' was set, so don't mix channel audio */
 		f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, AST_FORMAT_SLINEAR);
 	} else {
@@ -297,6 +297,7 @@
 	ast_verb(2, "Spying on channel %s\n", name);
 
 	memset(&csth, 0, sizeof(csth));
+	ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL);
 
 	ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy");