diff options
author | Mark Spencer <markster@digium.com> | 2005-02-17 15:05:26 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-02-17 15:05:26 +0000 |
commit | f2f3825130954e2665aab6feb3d6607d54487902 (patch) | |
tree | 79a733ec0cbcd760c1468522f1deca1b98938b62 /res/res_monitor.c | |
parent | ce18e66db2ffb391aadee3307a6aee27595f3587 (diff) |
Make sure we search for url prefix only in format, not in filename (bug #3613)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_monitor.c')
-rwxr-xr-x | res/res_monitor.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 02c158362..a07e56d4b 100755 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -323,13 +323,6 @@ static int start_monitor_exec(struct ast_channel *chan, void *data) if (data && !ast_strlen_zero((char*)data)) { arg = ast_strdupa((char*)data); format = arg; - arg = strchr(format,':'); - if (arg) - { - *arg++ = 0; - urlprefix = arg; - } - else arg = format; fname_base = strchr(arg, '|'); if (fname_base) { *fname_base = 0; @@ -343,9 +336,13 @@ static int start_monitor_exec(struct ast_channel *chan, void *data) waitforbridge = 1; } } + arg = strchr(format,':'); + if (arg) { + *arg++ = 0; + urlprefix = arg; + } } - if (urlprefix) - { + if (urlprefix) { snprintf(tmp,sizeof(tmp) - 1,"%s/%s.%s",urlprefix,fname_base, ((strcmp(format,"gsm")) ? "wav" : "gsm")); if (!chan->cdr) |