[svn-commits] mmichelson: branch 1.6.0 r160556 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Dec  3 11:09:27 2008
New Revision: 160556

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160556
Log:
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.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=160556&r1=160555&r2=160556
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Dec  3 11:09:27 2008
@@ -3760,9 +3760,9 @@
 				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 @@
 					}
 				}
 				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);