diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 19:43:41 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-21 19:43:41 +0000 |
| commit | d2e1bfe91e00c4e57e3b9374d2516cf3c461dfc4 (patch) | |
| tree | 69cfbf71ba2b5ac4c2c99265e2605e3ad369a72c /res | |
| parent | 11f9122a85cda12c8acf3c0bc6b260e08e265349 (diff) | |
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.4@235940 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 437705c77..30aa8105a 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -169,8 +169,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", |