diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-02-16 18:39:46 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-02-16 18:39:46 +0000 |
commit | 7879cccafd1749e2670039f9ddf3a786f59f5429 (patch) | |
tree | 5af5652a74af59f67827cfdcfb8aef877163aace /res/res_monitor.c | |
parent | b69fb773d263f48df913cd54fda17b4c7eaa2ee3 (diff) |
Fix AMI Monitor action without File header converting channel name into filename.
* Fix potential Solaris crash if Monitor application has a urlbase and no
fname_base option.
........
Merged revisions 355574 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 355575 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@355576 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_monitor.c')
-rw-r--r-- | res/res_monitor.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index e57c68cd8..b87d0e757 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -333,10 +333,12 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha seq++; ast_mutex_unlock(&monitorlock); + /* Replace all '/' chars from the channel name with '-' chars. */ channel_name = ast_strdupa(ast_channel_name(chan)); - while ((p = strchr(channel_name, '/'))) { + for (p = channel_name; (p = strchr(p, '/')); ) { *p = '-'; } + snprintf(monitor->filename_base, FILENAME_MAX, "%s/%d-%s", ast_config_AST_MONITOR_DIR, (int)time(NULL), channel_name); monitor->filename_changed = 1; @@ -580,7 +582,8 @@ int AST_OPTIONAL_API_NAME(ast_monitor_change_fname)(struct ast_channel *chan, co ast_mkdir(dirname(name), 0777); } - /*!\note We cannot just compare filenames, due to symlinks, relative + /*! + * \note We cannot just compare filenames, due to symlinks, relative * paths, and other possible filesystem issues. We could use * realpath(3), but its use is discouraged. However, if we try to * create the same file from two different paths, the second will @@ -639,9 +642,9 @@ int AST_OPTIONAL_API_NAME(ast_monitor_change_fname)(struct ast_channel *chan, co */ static int start_monitor_exec(struct ast_channel *chan, const char *data) { - char *arg = NULL; - char *options = NULL; - char *delay = NULL; + char *arg; + char *options; + char *delay; char *urlprefix = NULL; char tmp[256]; int stream_action = X_REC_IN | X_REC_OUT; @@ -681,7 +684,7 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data) urlprefix = arg; } - if (urlprefix) { + if (!ast_strlen_zero(urlprefix) && !ast_strlen_zero(args.fname_base)) { snprintf(tmp, sizeof(tmp), "%s/%s.%s", urlprefix, args.fname_base, ((strcmp(args.format, "gsm")) ? "wav" : "gsm")); ast_channel_lock(chan); @@ -757,12 +760,13 @@ static int start_monitor_action(struct mansession *s, const struct message *m) } if (ast_strlen_zero(fname)) { - /* No filename base specified, default to channel name as per CLI */ + /* No filename specified, default to the channel name. */ ast_channel_lock(c); fname = ast_strdupa(ast_channel_name(c)); ast_channel_unlock(c); - /* Channels have the format technology/channel_name - have to replace that / */ - if ((d = strchr(fname, '/'))) { + + /* Replace all '/' chars from the channel name with '-' chars. */ + for (d = (char *) fname; (d = strchr(d, '/')); ) { *d = '-'; } } |