diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-13 14:20:46 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-13 14:20:46 +0000 |
commit | 7897126b5db001d2ac86bd10e63cf3a72e90b06f (patch) | |
tree | 828047f1899a6789804931724917706287096b1c /apps/app_queue.c | |
parent | 76d98301872cbd51d96f51f1473e61a55c7cf09f (diff) |
Merged revisions 188032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r188032 | mmichelson | 2009-04-13 09:17:56 -0500 (Mon, 13 Apr 2009) | 6 lines
Set all queue variables on both the caller and member channels.
This allows for the variables to be accessed if a member macro is run.
Thanks to Grigoriy Puzankin for bringing this up on the -dev list.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@188039 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r-- | apps/app_queue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 5726d4c5c..70c7d1ac8 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3876,6 +3876,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce snprintf(interfacevar, sizeof(interfacevar), "MEMBERINTERFACE=%s,MEMBERNAME=%s,MEMBERCALLS=%d,MEMBERLASTCALL=%ld,MEMBERPENALTY=%d,MEMBERDYNAMIC=%d,MEMBERREALTIME=%d", member->interface, member->membername, member->calls, (long)member->lastcall, member->penalty, member->dynamic, member->realtime); pbx_builtin_setvar_multiple(qe->chan, interfacevar); + pbx_builtin_setvar_multiple(peer, interfacevar); } /* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */ @@ -3884,10 +3885,12 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce snprintf(interfacevar, sizeof(interfacevar), "QEHOLDTIME=%ld,QEORIGINALPOS=%d", (long) time(NULL) - qe->start, qe->opos); pbx_builtin_setvar_multiple(qe->chan, interfacevar); + pbx_builtin_setvar_multiple(peer, interfacevar); } /* try to set queue variables if configured to do so*/ set_queue_variables(qe->parent, qe->chan); + set_queue_variables(qe->parent, peer); ao2_unlock(qe->parent); ast_channel_lock(qe->chan); |