Merged revisions 320650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r320650 | rmudgett | 2011-05-23 12:53:44 -0500 (Mon, 23 May 2011) | 16 lines Add ConnectedLineNum/Name headers to output of AMI action Status. * Add ConnectedLineNum and ConnectedLineName headers to the output of the AMI action Status. This makes it easier to find out who the channel is connected to without having to lookup BridgedChannel or when they are connected to an application (e.g.: VoiceMail) which has no bridged channel. * Bridged channels with no CallerID had "" instead of "<unknown>" output, that might be a bug as "<unknown>" was what older versions used. (closes issue #18158) Reported by: gareth Patches: svn-292308.diff uploaded by gareth (license 208) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@320651 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
e7e1957a37
commit
9925da046c
2
CHANGES
2
CHANGES
|
@ -566,6 +566,8 @@ Asterisk Manager Interface
|
|||
* Added a new eventfilter option per user to allow whitelisting and blacklisting
|
||||
of events.
|
||||
* Added optional parkinglot variable for park command.
|
||||
* Added ConnectedLineNum and ConnectedLineName headers to the output of Status
|
||||
manager action.
|
||||
|
||||
Channel Event Logging
|
||||
---------------------
|
||||
|
|
|
@ -3184,6 +3184,8 @@ static int action_status(struct mansession *s, const struct message *m)
|
|||
"Channel: %s\r\n"
|
||||
"CallerIDNum: %s\r\n"
|
||||
"CallerIDName: %s\r\n"
|
||||
"ConnectedLineNum: %s\r\n"
|
||||
"ConnectedLineName: %s\r\n"
|
||||
"Accountcode: %s\r\n"
|
||||
"ChannelState: %d\r\n"
|
||||
"ChannelStateDesc: %s\r\n"
|
||||
|
@ -3197,8 +3199,10 @@ static int action_status(struct mansession *s, const struct message *m)
|
|||
"%s"
|
||||
"\r\n",
|
||||
c->name,
|
||||
S_COR(c->caller.id.number.valid, c->caller.id.number.str, ""),
|
||||
S_COR(c->caller.id.name.valid, c->caller.id.name.str, ""),
|
||||
S_COR(c->caller.id.number.valid, c->caller.id.number.str, "<unknown>"),
|
||||
S_COR(c->caller.id.name.valid, c->caller.id.name.str, "<unknown>"),
|
||||
S_COR(c->connected.id.number.valid, c->connected.id.number.str, "<unknown>"),
|
||||
S_COR(c->connected.id.name.valid, c->connected.id.name.str, "<unknown>"),
|
||||
c->accountcode,
|
||||
c->_state,
|
||||
ast_state2str(c->_state), c->context,
|
||||
|
@ -3210,6 +3214,8 @@ static int action_status(struct mansession *s, const struct message *m)
|
|||
"Channel: %s\r\n"
|
||||
"CallerIDNum: %s\r\n"
|
||||
"CallerIDName: %s\r\n"
|
||||
"ConnectedLineNum: %s\r\n"
|
||||
"ConnectedLineName: %s\r\n"
|
||||
"Account: %s\r\n"
|
||||
"State: %s\r\n"
|
||||
"%s"
|
||||
|
@ -3220,6 +3226,8 @@ static int action_status(struct mansession *s, const struct message *m)
|
|||
c->name,
|
||||
S_COR(c->caller.id.number.valid, c->caller.id.number.str, "<unknown>"),
|
||||
S_COR(c->caller.id.name.valid, c->caller.id.name.str, "<unknown>"),
|
||||
S_COR(c->connected.id.number.valid, c->connected.id.number.str, "<unknown>"),
|
||||
S_COR(c->connected.id.name.valid, c->connected.id.name.str, "<unknown>"),
|
||||
c->accountcode,
|
||||
ast_state2str(c->_state), bridge, c->uniqueid,
|
||||
ast_str_buffer(str), idText);
|
||||
|
|
Reference in New Issue