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

Merged revisions 248757 via svnmerge from

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

........
  r248757 | jpeeler | 2010-02-25 12:06:54 -0600 (Thu, 25 Feb 2010) | 15 lines
  
  Ensure that monitor recordings are written to the correct location.
  
  Recordings should be placed in the monitor directory when a non-absolute path
  is used.
  
  Exact dialplan used for testing:
  exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test,b)
  exten => 5040, n, dial(sip/5001)
  exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2,b)
  exten => 5041, n, dial(sip/5001)
  exten => 5042, 1, monitor(wav,monitor_test3,b)
  exten => 5042, n, dial(sip/5001)
  
  ABE-2101
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@248793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-02-25 18:37:56 +00:00
parent 65d3e30e8d
commit d64987f8ad
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/res_monitor.c
View File

@@ -305,18 +305,19 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
/* Determine file names */
if (!ast_strlen_zero(fname_base)) {
int directory = strchr(fname_base, '/') ? 1 : 0;
const char *absolute = *fname_base == '/' ? "" : "/";
const char *absolute = *fname_base == '/' ? "" : ast_config_AST_MONITOR_DIR;
snprintf(monitor->read_filename, FILENAME_MAX, "%s/%s-in",
absolute, fname_base);
snprintf(monitor->write_filename, FILENAME_MAX, "%s/%s-out",
absolute, fname_base);
snprintf(monitor->filename_base, FILENAME_MAX, "%s/%s",
absolute, fname_base);
/* try creating the directory just in case it doesn't exist */
if (directory) {
char *name = ast_strdupa(fname_base);
ast_mkdir(dirname(name), 0777);
ast_mkdir(dirname(monitor->filename_base), 0777);
}
snprintf(monitor->read_filename, FILENAME_MAX, "%s%s%s-in",
directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
snprintf(monitor->write_filename, FILENAME_MAX, "%s%s%s-out",
directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
snprintf(monitor->filename_base, FILENAME_MAX, "%s%s%s",
directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
} else {
ast_mutex_lock(&monitorlock);
snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",