diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-11 23:23:16 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-11 23:23:16 +0000 |
| commit | e7ab4552eed87b06636186a4b8e0a5614bf4c508 (patch) | |
| tree | 3afb119dc5983cdd558e32ac3db48c91e2750b74 /manager.c | |
| parent | 8318acbef1eb5eb4af027133206651300c5c206e (diff) | |
Bug 6943 - transition away from using CallerID header, when we really mean CallerIDNum
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@19436 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'manager.c')
| -rw-r--r-- | manager.c | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -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>" ); |