Merged revisions 248793 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r248793 | jpeeler | 2010-02-25 12:37:56 -0600 (Thu, 25 Feb 2010) | 22 lines

  Merged revisions 248757 via svnmerge from
  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/branches/1.6.1@248796 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 88cd4f7bd0d85d9a3f5519ca9b253c8b63dffb42..88c258a79cac836e81cf23222f5999ddbf2d286c 100644 (file)
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -166,18 +166,19 @@ int ast_monitor_start(    struct ast_channel *chan, const char *format_spec,
                /* 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",