Expand setinterfacevar option to also set a variable, MEMBERNAME, which contains...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44218 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index c32fdefb911033b3ad2c932a5b4a5ae8404a93aa..36b65ef4b91dc33981c2c97593c791fc7628a875 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,3 +23,5 @@ Changes since Asterisk 1.4-beta was branched:
      the time to name the logger files instead of sequence number.
   * The output of CallerID in Manager events is now more consistent.
      CallerIDNum is used for number and CallerIDName for name.
+  * setinterfacevar option in queues.conf also now sets a variable
+     called MEMBERNAME which contains the member's name.

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7e37b19236720ed38c1efe3bf8a61cd1076adf4d..79a8f2ebda890380c4375cbc5ab1dec5cdc4e620 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2580,8 +2580,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
                        ast_channel_sendurl(peer, url);
                }
-               if (qe->parent->setinterfacevar)
+               if (qe->parent->setinterfacevar) {
                                pbx_builtin_setvar_helper(qe->chan, "MEMBERINTERFACE", member->interface);
+                               pbx_builtin_setvar_helper(qe->chan, "MEMBERNAME", member->membername);
+               }
                if (!ast_strlen_zero(agi)) {
                        if (option_debug)
                                ast_log(LOG_DEBUG, "app_queue: agi=%s.\n", agi);

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index 42c1e897764d0c30aab8ef51aa14090ed0483ee7..85064aeb6692b4dd919af368af7e7f869ac39648 100644 (file)
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -129,6 +129,7 @@ monitor-type = MixMonitor
 ;
 ; If set to yes, just prior to the caller being bridged with a queue member 
 ; the MEMBERINTERFACE variable will be set with the interface name (eg. Agent/1234)
+; and the MEMBERNAME variable will be set with the member name (eg. Joe Soap)
 ; of the queue member that was chosen and is now connected to be bridged with
 ; the caller
 ;

diff --git a/doc/channelvariables.txt b/doc/channelvariables.txt
index 334b9064d780eaf780cc8b80480f8f8c0c931ebd..123f9a77efe996ece06a192657f5bbce78862e6f 100644 (file)
--- a/doc/channelvariables.txt
+++ b/doc/channelvariables.txt
@@ -591,6 +591,8 @@ ${HINTNAME}         * Suggested Caller*ID name for this extension
 ${INVALID_EXTEN}       The invalid called extension (used in the "i" extension)
 ${LANGUAGE}            * Current language (Deprecated; use ${LANGUAGE()})
 ${LEN(VAR)}            * String length of VAR (integer)
+${MEMBERINTERFACE}     * The interface name of the queuemember that was chosen
+${MEMBERNAME}          * The member name of the queuemember that was chosen
 ${PRIORITY}            * Current priority in the dialplan
 ${PRIREDIRECTREASON}   Reason for redirect on PRI, if a call was directed
 ${RDNIS}               * Redirected Dial Number ID Service (Deprecated; use ${CALLERID(rdnis)})