mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-03 19:16:46 +00:00
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -819,19 +819,19 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
|
|||||||
mac++; /* Leave the "m" in the string */
|
mac++; /* Leave the "m" in the string */
|
||||||
while (*mac && (*mac != ')'))
|
while (*mac && (*mac != ')'))
|
||||||
*(mac++) = 'X';
|
*(mac++) = 'X';
|
||||||
if (*mac)
|
if (*mac) {
|
||||||
*mac = 'X';
|
*mac = 'X';
|
||||||
else {
|
mac = strchr(mohclass, ')');
|
||||||
ast_log(LOG_WARNING, "Could not find music on hold class to use, assuming default.\n");
|
|
||||||
mohclass=NULL;
|
|
||||||
}
|
|
||||||
mac = strchr(macroname, ')');
|
|
||||||
if (mac)
|
if (mac)
|
||||||
*mac = '\0';
|
*mac = '\0';
|
||||||
else {
|
else {
|
||||||
ast_log(LOG_WARNING, "Music on hold class specified without trailing ')'\n");
|
ast_log(LOG_WARNING, "Music on hold class specified without trailing ')'\n");
|
||||||
mohclass = NULL;
|
mohclass = NULL;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
ast_log(LOG_WARNING, "Could not find music on hold class to use, assuming default.\n");
|
||||||
|
mohclass=NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* Extract privacy info from transfer */
|
/* Extract privacy info from transfer */
|
||||||
if ((s = strstr(transfer, "P("))) {
|
if ((s = strstr(transfer, "P("))) {
|
||||||
|
@@ -1501,7 +1501,7 @@ static int load_config(void)
|
|||||||
} else
|
} else
|
||||||
transferdigittimeout = transferdigittimeout * 1000;
|
transferdigittimeout = transferdigittimeout * 1000;
|
||||||
} else if (!strcasecmp(var->name, "featuredigittimeout")) {
|
} else if (!strcasecmp(var->name, "featuredigittimeout")) {
|
||||||
if ((sscanf(var->value, "%d", &featuredigittimeout) != 1) || (transferdigittimeout < 1)) {
|
if ((sscanf(var->value, "%d", &featuredigittimeout) != 1) || (featuredigittimeout < 1)) {
|
||||||
ast_log(LOG_WARNING, "%s is not a valid featuredigittimeout\n", var->value);
|
ast_log(LOG_WARNING, "%s is not a valid featuredigittimeout\n", var->value);
|
||||||
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
|
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user