diff options
| author | Kevin Harwell <kharwell@digium.com> | 2014-12-09 20:19:40 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2014-12-09 20:19:40 +0000 |
| commit | 2f21f85c3733ff633937549c3ba8983df0636dce (patch) | |
| tree | 947d5e0ef279ca153fc3dbb27ed39a3663ced829 /main | |
| parent | 525c823b4b7e63dc74669ebb5284397713804c75 (diff) | |
ARI/AMI: Include language in standard channel snapshot output
The channel "language" was already part of a channel snapshot, however is was
not sent out over AMI or ARI. This patch makes it so the channel "language" is
included in the appropriate AMI or ARI events.
ASTERISK-24553 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/4245/
........
Merged revisions 429204 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager_channels.c | 2 | ||||
| -rw-r--r-- | main/stasis_channels.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/main/manager_channels.c b/main/manager_channels.c index d431af24c..c12d94ee9 100644 --- a/main/manager_channels.c +++ b/main/manager_channels.c @@ -426,6 +426,7 @@ struct ast_str *ast_manager_build_channel_state_string_prefix( "%sCallerIDName: %s\r\n" "%sConnectedLineNum: %s\r\n" "%sConnectedLineName: %s\r\n" + "%sLanguage: %s\r\n" "%sAccountCode: %s\r\n" "%sContext: %s\r\n" "%sExten: %s\r\n" @@ -438,6 +439,7 @@ struct ast_str *ast_manager_build_channel_state_string_prefix( prefix, S_OR(snapshot->caller_name, "<unknown>"), prefix, S_OR(snapshot->connected_number, "<unknown>"), prefix, S_OR(snapshot->connected_name, "<unknown>"), + prefix, snapshot->language, prefix, snapshot->accountcode, prefix, snapshot->context, prefix, snapshot->exten, diff --git a/main/stasis_channels.c b/main/stasis_channels.c index 816efdb45..11a2941fa 100644 --- a/main/stasis_channels.c +++ b/main/stasis_channels.c @@ -888,7 +888,7 @@ struct ast_json *ast_channel_snapshot_to_json( /* Broken up into groups of three for readability */ "{ s: s, s: s, s: s," " s: o, s: o, s: s," - " s: o, s: o }", + " s: o, s: o, s: s }", /* First line */ "id", snapshot->uniqueid, "name", snapshot->name, @@ -902,7 +902,8 @@ struct ast_json *ast_channel_snapshot_to_json( /* Third line */ "dialplan", ast_json_dialplan_cep( snapshot->context, snapshot->exten, snapshot->priority), - "creationtime", ast_json_timeval(snapshot->creationtime, NULL)); + "creationtime", ast_json_timeval(snapshot->creationtime, NULL), + "language", snapshot->language); return ast_json_ref(json_chan); } |