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: https://origsvn.digium.com/svn/asterisk/trunk@320651 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 5c77c0732725097bb4f98b4a2193ef5fd5b3b413..52f21a01f2a2ba8ea6f8c1d508e243fd25fa1944 100644 (file)
--- a/CHANGES
+++ b/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
 ---------------------

diff --git a/main/manager.c b/main/manager.c
index 9180b005aa98c9f124c3b39b534b4a9668b27f03..4f4984b53e11ebe3c64f7d3122e22adf04a5c02c 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -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);