kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 235940 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r235940 | jpeeler | 2009-12-21 13:43:41 -0600 (Mon, 21 Dec 2009) | 13 lines
  
  Change Monitor to not assume file to write to does not contain pathing.
  
  227944 changed the fname_base argument to always append the configured monitor
  path. This change was necessary to properly compare files for uniqueness. 
  If a full path is given though, nothing needs to be appended and that is
  handled correctly now.
  
  (closes issue #16377)
  (closes issue #16376)
  Reported by: bcnit
  Patches:
        res_monitor.c-issue16376-1.patch uploaded by dant (license 670)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@235941 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-12-21 19:54:20 +00:00
parent ef9be94b35
commit f95ee393f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_monitor.c
View File

@@ -315,8 +315,8 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base); directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
snprintf(monitor->write_filename, FILENAME_MAX, "%s%s%s-out", snprintf(monitor->write_filename, FILENAME_MAX, "%s%s%s-out",
directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base); directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
snprintf(monitor->filename_base, FILENAME_MAX, "%s/%s", snprintf(monitor->filename_base, FILENAME_MAX, "%s%s%s",
ast_config_AST_MONITOR_DIR, fname_base); directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
} else { } else {
ast_mutex_lock(&monitorlock); ast_mutex_lock(&monitorlock);
snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld", snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",