[asterisk-commits] trunk r19436 - in /trunk: UPGRADE.txt manager.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Apr 11 18:23:16 2006
New Revision: 19436

URL: http://svn.digium.com/view/asterisk?rev=19436&view=rev
Log:
Bug 6943 - transition away from using CallerID header, when we really mean CallerIDNum

Modified:
    trunk/UPGRADE.txt
    trunk/manager.c

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?rev=19436&r1=19435&r2=19436&view=diff
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Tue Apr 11 18:23:16 2006
@@ -35,6 +35,15 @@
   using indication tones, so typing in skip would give you unexpected results.
 
 * OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
+
+Manager:
+
+* After executing the 'status' manager action, the "Status" manager events
+  included the header "CallerID:" which was actually only the CallerID number,
+  and not the full CallerID string.  This header has been renamed to
+  "CallerIDNum".  For compatibility purposes, the CallerID parameter will remain
+  until after the release of 1.4, when it will be removed.  Please use the time
+  during the 1.4 release to make this transition.
 
 Variables:
 

Modified: trunk/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/manager.c?rev=19436&r1=19435&r2=19436&view=diff
==============================================================================
--- trunk/manager.c (original)
+++ trunk/manager.c Tue Apr 11 18:23:16 2006
@@ -1186,7 +1186,8 @@
 			"Event: Status\r\n"
 			"Privilege: Call\r\n"
 			"Channel: %s\r\n"
-			"CallerID: %s\r\n"
+			"CallerID: %s\r\n"		/* This parameter is deprecated and will be removed post-1.4 */
+			"CallerIDNum: %s\r\n"
 			"CallerIDName: %s\r\n"
 			"Account: %s\r\n"
 			"State: %s\r\n"
@@ -1200,6 +1201,7 @@
 			"\r\n",
 			c->name, 
 			c->cid.cid_num ? c->cid.cid_num : "<unknown>", 
+			c->cid.cid_num ? c->cid.cid_num : "<unknown>", 
 			c->cid.cid_name ? c->cid.cid_name : "<unknown>", 
 			c->accountcode,
 			ast_state2str(c->_state), c->context,
@@ -1209,7 +1211,8 @@
 			"Event: Status\r\n"
 			"Privilege: Call\r\n"
 			"Channel: %s\r\n"
-			"CallerID: %s\r\n"
+			"CallerID: %s\r\n"		/* This parameter is deprecated and will be removed post-1.4 */
+			"CallerIDNum: %s\r\n"
 			"CallerIDName: %s\r\n"
 			"Account: %s\r\n"
 			"State: %s\r\n"
@@ -1218,6 +1221,7 @@
 			"%s"
 			"\r\n",
 			c->name, 
+			c->cid.cid_num ? c->cid.cid_num : "<unknown>", 
 			c->cid.cid_num ? c->cid.cid_num : "<unknown>", 
 			c->cid.cid_name ? c->cid.cid_name : "<unknown>", 
 			c->accountcode,
@@ -1347,10 +1351,12 @@
 		"Exten: %s\r\n"
 		"Reason: %d\r\n"
 		"Uniqueid: %s\r\n"
-		"CallerID: %s\r\n"
+		"CallerID: %s\r\n"		/* This parameter is deprecated and will be removed post-1.4 */
+		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n",
 		in->idtext, in->tech, in->data, in->context, in->exten, reason, 
 		chan ? chan->uniqueid : "<null>",
+		in->cid_num ? in->cid_num : "<unknown>",
 		in->cid_num ? in->cid_num : "<unknown>",
 		in->cid_name ? in->cid_name : "<unknown>"
 		);