kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 228189 via svnmerge from

Browse Source 
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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@228195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-11-05 21:27:30 +00:00
parent a9762a9ea6
commit 7897298edf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_chanspy.c
View File

@@ -370,7 +370,7 @@ static int spy_generate(struct ast_channel *chan, void *data, int len, int sampl
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 {
@@ -486,6 +486,7 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
spyer_name, 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");