diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-05-25 17:14:11 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-05-25 17:14:11 +0000 |
| commit | 0096238b5256864fde6540b3b478705663f796a4 (patch) | |
| tree | 0f7c1f8d63351e5eb1252d8c1fffb66751df6f3a /apps/app_fax.c | |
| parent | a42bf8cc9250f875f6d26ca7cd2d81e2ea8821d8 (diff) | |
Merged revisions 320823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r320823 | rmudgett | 2011-05-25 12:06:38 -0500 (Wed, 25 May 2011) | 18 lines
The AMI Newstate event contains different information between v1.4 and v1.8.
The addition of connected line support in v1.8 changes the behavior of the
channel caller ID somewhat. The channel caller ID value no longer time
shares with the connected line ID on outgoing call legs. The timing of
some AMI events/responses output the connected line ID as caller ID.
These party ID's are now separate.
* The ConnectedLineNum and ConnectedLineName headers were added to many
AMI events/responses if the CallerIDNum/CallerIDName headers were also
present.
(closes issue #18252)
Reported by: gje
Tested by: rmudgett
Review: https://reviewboard.asterisk.org/r/1227/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_fax.c')
| -rw-r--r-- | apps/app_fax.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/app_fax.c b/apps/app_fax.c index 39c6ad1b6..0d59dfa3a 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -255,6 +255,9 @@ static void phase_e_handler(t30_state_t *f, void *user_data, int result) "Channel: %s\r\n" "Exten: %s\r\n" "CallerID: %s\r\n" + "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "RemoteStationID: %s\r\n" "LocalStationID: %s\r\n" "PagesTransferred: %d\r\n" @@ -264,6 +267,9 @@ static void phase_e_handler(t30_state_t *f, void *user_data, int result) s->chan->name, s->chan->exten, S_COR(s->chan->caller.id.number.valid, s->chan->caller.id.number.str, ""), + S_COR(s->chan->caller.id.name.valid, s->chan->caller.id.name.str, ""), + S_COR(s->chan->connected.id.number.valid, s->chan->connected.id.number.str, ""), + S_COR(s->chan->connected.id.name.valid, s->chan->connected.id.name.str, ""), far_ident, local_ident, pages_transferred, |