mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 14:58:25 +00:00
Merged revisions 236300 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r236300 | tilghman | 2009-12-23 12:25:27 -0600 (Wed, 23 Dec 2009) | 7 lines AGI may be invoked from outside the dialplan (closes issue #16510) Reported by: atis Patches: 20091223__issue16510.diff.txt uploaded by tilghman (license 14) Tested by: atis ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@236302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -455,12 +455,12 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg
|
|||||||
* call a Gosub for the CALLEE channel in Dial or Queue.
|
* call a Gosub for the CALLEE channel in Dial or Queue.
|
||||||
*/
|
*/
|
||||||
if (argc == 5) {
|
if (argc == 5) {
|
||||||
if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + 1, argv[4]) < 0) {
|
if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + (chan->pbx ? 1 : 0), argv[4]) < 0) {
|
||||||
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
||||||
gosub_args = NULL;
|
gosub_args = NULL;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + 1) < 0) {
|
if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + (chan->pbx ? 1 : 0)) < 0) {
|
||||||
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
||||||
gosub_args = NULL;
|
gosub_args = NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user