Index: manager.c =================================================================== --- manager.c (revision 19397) +++ manager.c (working copy) @@ -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 : "", + c->cid.cid_num ? c->cid.cid_num : "", c->cid.cid_name ? c->cid.cid_name : "", 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" @@ -1219,6 +1222,7 @@ "\r\n", c->name, c->cid.cid_num ? c->cid.cid_num : "", + c->cid.cid_num ? c->cid.cid_num : "", c->cid.cid_name ? c->cid.cid_name : "", c->accountcode, ast_state2str(c->_state), bridge, c->uniqueid, idText); @@ -1347,11 +1351,13 @@ "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 : "", in->cid_num ? in->cid_num : "", + in->cid_num ? in->cid_num : "", in->cid_name ? in->cid_name : "" ); Index: UPGRADE.txt =================================================================== --- UPGRADE.txt (revision 19397) +++ UPGRADE.txt (working copy) @@ -36,6 +36,15 @@ * 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},