diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 19:58:41 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 19:58:41 +0000 |
| commit | 9adb9754f4a42393d30c094e3e2da10cce7f7c70 (patch) | |
| tree | 89f916bbcbd0693632de3c8030d1cd7e47595db6 /res | |
| parent | 3f36fb21f021bad51afedfc5f9cbe500b8543365 (diff) | |
Merged revisions 235941 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r235941 | jpeeler | 2009-12-21 13:54:20 -0600 (Mon, 21 Dec 2009) | 20 lines
Merged revisions 235940 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@235944 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 13b5fe01d..51a0f142d 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -177,8 +177,8 @@ int ast_monitor_start( struct ast_channel *chan, const char *format_spec, 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", - ast_config_AST_MONITOR_DIR, 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", |