mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-04 03:20:33 +00:00
Fix situation for when there is no monitor_option defined, but there is a monitor_exec defined.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2365,13 +2365,14 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
|||||||
mixmonapp = NULL;
|
mixmonapp = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!monitor_options)
|
||||||
|
monitor_options = ast_strdupa("");
|
||||||
|
|
||||||
if (mixmonapp) {
|
if (mixmonapp) {
|
||||||
if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options))
|
if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options))
|
||||||
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s|%s", tmpid2, monitor_options, monitor_exec);
|
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s|%s", tmpid2, monitor_options, monitor_exec);
|
||||||
else if (!ast_strlen_zero(monitor_options))
|
|
||||||
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);
|
|
||||||
else
|
else
|
||||||
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b", tmpid2);
|
snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options);
|
||||||
|
|
||||||
if (option_debug)
|
if (option_debug)
|
||||||
ast_log(LOG_DEBUG, "Arguments being passed to MixMonitor: %s\n", mixmonargs);
|
ast_log(LOG_DEBUG, "Arguments being passed to MixMonitor: %s\n", mixmonargs);
|
||||||
|
Reference in New Issue
Block a user