diff options
| -rw-r--r-- | UPGRADE.txt | 9 | ||||
| -rw-r--r-- | manager.c | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index 600a1d42f..9c505b2b6 100644 --- 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}, @@ -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>" ); |