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

Merged revisions 248860 via svnmerge from

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

........
  r248860 | jpeeler | 2010-02-25 15:22:06 -0600 (Thu, 25 Feb 2010) | 18 lines
  
  Ensure that monitor recordings are written to the correct location (again)
  
  This is an extension to 248757. As such the dialplan test has been extended:
  
  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)
  exten => 5043, 1, monitor(wav,tmp/jeff/monitor_test3,m)
  exten => 5043, n, changemonitor(monitor_test4)
  exten => 5043, n, dial(sip/5001)
  exten => 5044, 1, monitor(wav,monitor_test4,m)
  exten => 5044, n, changemonitor(tmp/jeff/monitor_test5) ; this looks to fail by design and emits a warning
  exten => 5044, n, dial(sip/5001)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@248952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-02-25 23:09:54 +00:00
parent a1af5f4f72
commit 406bb18127
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_monitor.c
View File

@@ -316,7 +316,8 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
/* try creating the directory just in case it doesn't exist */
if (directory) {
ast_mkdir(dirname(monitor->filename_base), 0777);
char *name = ast_strdupa(monitor->filename_base);
ast_mkdir(dirname(name), 0777);
}
} else {
ast_mutex_lock(&monitorlock);
@@ -559,12 +560,12 @@ int AST_OPTIONAL_API_NAME(ast_monitor_change_fname)(struct ast_channel *chan, co
if (chan->monitor) {
int directory = strchr(fname_base, '/') ? 1 : 0;
const char *absolute = *fname_base == '/' ? "" : "/";
const char *absolute = *fname_base == '/' ? "" : ast_config_AST_MONITOR_DIR;
char tmpstring[sizeof(chan->monitor->filename_base)] = "";
int i, fd[2] = { -1, -1 }, doexit = 0;
/* before continuing, see if we're trying to rename the file to itself... */
snprintf(tmpstring, sizeof(tmpstring), "%s%s%s", directory ? "" : ast_config_AST_MONITOR_DIR, absolute, fname_base);
snprintf(tmpstring, sizeof(tmpstring), "%s/%s", absolute, fname_base);
/*!\note We cannot just compare filenames, due to symlinks, relative
* paths, and other possible filesystem issues. We could use