From f2168e3a6724832e9a5492954f7fbbb35363bc6e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 3 Dec 2008 17:09:27 +0000 Subject: [PATCH] Merged revisions 160555 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r160555 | mmichelson | 2008-12-03 11:07:09 -0600 (Wed, 03 Dec 2008) | 11 lines When investigating issue #13548, I found that gosub handling in app_queue was just completely wrong, mostly because the channel operations being performed were being done on the incorrect channel. With this set of changes, a gosub will correctly run on the answering queue member's channel. There are still crash issues which occur if there are dialplan syntax errors, so I cannot yet close the referenced issue. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160556 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 04f522c91a..80579a11e1 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3760,9 +3760,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce char *gosub_args, *gosub_argstart; /* Set where we came from */ - ast_copy_string(qe->chan->context, "app_dial_gosub_virtual_context", sizeof(qe->chan->context)); - ast_copy_string(qe->chan->exten, "s", sizeof(qe->chan->exten)); - qe->chan->priority = 0; + ast_copy_string(peer->context, "app_queue_gosub_virtual_context", sizeof(peer->context)); + ast_copy_string(peer->exten, "s", sizeof(peer->exten)); + peer->priority = 0; gosub_argstart = strchr(gosubexec, ','); if (gosub_argstart) { @@ -3779,8 +3779,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce } } if (gosub_args) { - res = pbx_exec(qe->chan, app, gosub_args); - ast_pbx_run(qe->chan); + res = pbx_exec(peer, app, gosub_args); + ast_pbx_run(peer); free(gosub_args); if (option_debug) ast_log(LOG_DEBUG, "Gosub exited with status %d\n", res);