Make the Join event from app_queue use CallerIDNum insead of CallerID for
authorMatthew Nicholson <mnicholson@digium.com>
Tue, 25 Nov 2008 00:05:41 +0000 (00:05 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Tue, 25 Nov 2008 00:05:41 +0000 (00:05 +0000)
indicating the callerid number just like the rest of asterisk.

(closes issue #13883)
Reported by: davidw

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

UPGRADE.txt
apps/app_queue.c

index 8801608..199da5e 100644 (file)
@@ -65,6 +65,9 @@ From 1.6.0.x to 1.6.1:
   to differentiate your variable from the append operator.  This potential
   conflict is unlikely, but is documented here to be thorough.
 
+* The "Join" event from app_queue now uses the CallerIDNum header instead of
+  the CallerID header to indicate the CallerID number.
+
 From 1.6.1 to 1.6.2:
 
 * The default console now will use colors according to the default background
index a94df34..3357dd8 100644 (file)
@@ -1920,7 +1920,7 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result *
                q->count++;
                res = 0;
                manager_event(EVENT_FLAG_CALL, "Join",
-                       "Channel: %s\r\nCallerID: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n",
+                       "Channel: %s\r\nCallerIDNum: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n",
                        qe->chan->name,
                        S_OR(qe->chan->cid.cid_num, "unknown"), /* XXX somewhere else it is <unknown> */
                        S_OR(qe->chan->cid.cid_name, "unknown"),