Merged revisions 235940 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Mon, 21 Dec 2009 19:54:20 +0000 (19:54 +0000)
committerJeff Peeler <jpeeler@digium.com>
Mon, 21 Dec 2009 19:54:20 +0000 (19:54 +0000)
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

res/res_monitor.c

index e00b7c5..ce2dbdc 100644 (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);
                        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->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",
                } else {
                        ast_mutex_lock(&monitorlock);
                        snprintf(monitor->read_filename, FILENAME_MAX, "%s/audio-in-%ld",