Bug 6943 - transition away from using CallerID header, when we really mean CallerIDNum

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 600a1d42f3d428a921f18a590c78854c9d962599..9c505b2b61e1f6efd8a691349500a5ea1c651e15 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -36,6 +36,15 @@ Applications:
 
 * 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:
 
 * The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},

diff --git a/manager.c b/manager.c
index 56e41fd23c82ea02f1c3ac67bfd70ea6aa70880a..05f0e990f338ffded5ae5a9e78655399bd576dbc 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -1186,7 +1186,8 @@ static int action_status(struct mansession *s, struct message *m)
                        "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 @@ static int action_status(struct mansession *s, struct message *m)
                        "\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 @@ static int action_status(struct mansession *s, struct message *m)
                        "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"
@@ -1219,6 +1222,7 @@ static int action_status(struct mansession *s, struct message *m)
                        "\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), bridge, c->uniqueid, idText);
@@ -1347,11 +1351,13 @@ static void *fast_originate(void *data)
                "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>"
                );