kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-04-11 23:23:16 +00:00
parent 020305fb58
commit e462f79205
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manager.c
View File

@@ -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>"
);