[svn-commits] file: trunk r44217 - in /trunk: ./ apps/ main/ res/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon Oct 2 13:35:17 MST 2006
Author: file
Date: Mon Oct 2 15:35:16 2006
New Revision: 44217
URL: http://svn.digium.com/view/asterisk?rev=44217&view=rev
Log:
Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler)
Modified:
trunk/CHANGES
trunk/apps/app_dial.c
trunk/apps/app_dumpchan.c
trunk/apps/app_meetme.c
trunk/apps/app_queue.c
trunk/main/channel.c
trunk/res/res_features.c
Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Oct 2 15:35:16 2006
@@ -21,3 +21,5 @@
statistics during a reload.
* Added rotatetimestamp option to logger.conf which will use
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.
Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Mon Oct 2 15:35:16 2006
@@ -373,11 +373,10 @@
static void senddialevent(struct ast_channel *src, struct ast_channel *dst)
{
- /* XXX do we need also CallerIDnum ? */
manager_event(EVENT_FLAG_CALL, "Dial",
"Source: %s\r\n"
"Destination: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"SrcUniqueID: %s\r\n"
"DestUniqueID: %s\r\n",
Modified: trunk/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dumpchan.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/apps/app_dumpchan.c (original)
+++ trunk/apps/app_dumpchan.c Mon Oct 2 15:35:16 2006
@@ -82,7 +82,7 @@
"Name= %s\n"
"Type= %s\n"
"UniqueID= %s\n"
- "CallerID= %s\n"
+ "CallerIDNum= %s\n"
"CallerIDName= %s\n"
"DNIDDigits= %s\n"
"RDNIS= %s\n"
Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Mon Oct 2 15:35:16 2006
@@ -1910,8 +1910,8 @@
"Uniqueid: %s\r\n"
"Meetme: %s\r\n"
"Usernum: %d\r\n"
- "CallerIDnum: %s\r\n"
- "CallerIDname: %s\r\n"
+ "CallerIDNum: %s\r\n"
+ "CallerIDName: %s\r\n"
"Duration: %ld\r\n",
chan->name, chan->uniqueid, conf->confno,
user->user_no,
Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Oct 2 15:35:16 2006
@@ -1659,7 +1659,7 @@
manager_event(EVENT_FLAG_AGENT, "AgentCalled",
"AgentCalled: %s\r\n"
"ChannelCalling: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"Context: %s\r\n"
"Extension: %s\r\n"
@@ -4131,7 +4131,7 @@
"Queue: %s\r\n"
"Position: %d\r\n"
"Channel: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"Wait: %ld\r\n"
"%s"
Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Oct 2 15:35:16 2006
@@ -2846,7 +2846,7 @@
manager_event(EVENT_FLAG_CALL, "Newchannel",
"Channel: %s\r\n"
"State: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"Uniqueid: %s\r\n",
c->name, ast_state2str(c->_state),
@@ -3473,7 +3473,7 @@
ast_cdr_setcid(chan->cdr, chan);
manager_event(EVENT_FLAG_CALL, "Newcallerid",
"Channel: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"Uniqueid: %s\r\n"
"CID-CallingPres: %d (%s)\r\n",
@@ -3499,7 +3499,7 @@
(oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
"Channel: %s\r\n"
"State: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"Uniqueid: %s\r\n",
chan->name, ast_state2str(chan->_state),
Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?rev=44217&r1=44216&r2=44217&view=diff
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Mon Oct 2 15:35:16 2006
@@ -399,7 +399,7 @@
"Channel: %s\r\n"
"From: %s\r\n"
"Timeout: %ld\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
pu->parkingexten, pu->chan->name, peer ? peer->name : "",
(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
@@ -1514,7 +1514,7 @@
manager_event(EVENT_FLAG_CALL, s,
"Exten: %s\r\n"
"Channel: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n\r\n",
parkingexten,
chan->name,
@@ -1768,7 +1768,7 @@
"Exten: %s\r\n"
"Channel: %s\r\n"
"From: %s\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n",
pu->parkingexten, pu->chan->name, chan->name,
S_OR(pu->chan->cid.cid_num, "<unknown>"),
@@ -1951,7 +1951,7 @@
"Channel: %s\r\n"
"From: %s\r\n"
"Timeout: %ld\r\n"
- "CallerID: %s\r\n"
+ "CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"%s"
"\r\n",
More information about the svn-commits
mailing list