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

AMI: Add Linkedid to the standard channel snapshot AMI event headers.

Browse Source 
* The AMI version is bumped to 2.8.0.

ASTERISK-25189 #close
Reported by: John Hardin

Change-Id: I2b1778c3fdc1dca0ed55db4e3a639eddfb16c2ac
This commit is contained in:
Richard Mudgett
2015-06-23 14:34:29 -05:00
parent db0521f905
commit 890c923786
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -17,6 +17,9 @@ AMI
* A new ContactStatus event has been added that reflects res_pjsip contact * A new ContactStatus event has been added that reflects res_pjsip contact
lifecycle changes: Created, Removed, Reachable, Unreachable, Unknown. lifecycle changes: Created, Removed, Reachable, Unreachable, Unknown.
* Added the Linkedid header to the common channel headers listed for each
channel in AMI events.
res_pjsip res_pjsip
------------------ ------------------
* A new 'g726_non_standard' endpoint option has been added that, when set to * A new 'g726_non_standard' endpoint option has been added that, when set to

7
UPGRADE.txt
View File

@@ -21,6 +21,13 @@
=== UPGRADE-12.txt -- Upgrade info for 11 to 12 === UPGRADE-12.txt -- Upgrade info for 11 to 12
=========================================================== ===========================================================
From 13.4.0 to 13.5.0:
AMI:
- The version of AMI has been bumped to 2.8.0 to account for backwards
compatible features included with this release. See CHANGES for more
information.
From 13.3.0 to 13.4.0: From 13.3.0 to 13.4.0:
Source Control: Source Control:

6
doc/appdocsxml.xslt
View File

@@ -98,6 +98,12 @@
<xsl:value-of select="concat(@prefix,'Uniqueid')"/> <xsl:value-of select="concat(@prefix,'Uniqueid')"/>
</xsl:attribute> </xsl:attribute>
</xsl:element> </xsl:element>
<xsl:element name="parameter">
<xsl:attribute name="name">
<xsl:value-of select="concat(@prefix,'Linkedid')"/>
</xsl:attribute>
<para>Uniqueid of the oldest channel associated with this channel.</para>
</xsl:element>
</xsl:template> </xsl:template>
<xsl:template match="bridge_snapshot"> <xsl:template match="bridge_snapshot">

2
include/asterisk/manager.h
View File

@@ -54,7 +54,7 @@
- \ref manager.c Main manager code file - \ref manager.c Main manager code file
*/ */
#define AMI_VERSION "2.7.0" #define AMI_VERSION "2.8.0"
#define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */ #define DEFAULT_MANAGER_PORT 5038 /* Default port for Asterisk management via TCP */
#define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ #define DEFAULT_MANAGER_TLS_PORT 5039 /* Default port for Asterisk management via TCP */

6
main/manager_channels.c
View File

@@ -435,7 +435,8 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
"%sContext: %s\r\n" "%sContext: %s\r\n"
"%sExten: %s\r\n" "%sExten: %s\r\n"
"%sPriority: %d\r\n" "%sPriority: %d\r\n"
"%sUniqueid: %s\r\n", "%sUniqueid: %s\r\n"
"%sLinkedid: %s\r\n",
prefix, snapshot->name, prefix, snapshot->name,
prefix, snapshot->state, prefix, snapshot->state,
prefix, ast_state2str(snapshot->state), prefix, ast_state2str(snapshot->state),
@@ -448,7 +449,8 @@ struct ast_str *ast_manager_build_channel_state_string_prefix(
prefix, snapshot->context, prefix, snapshot->context,
prefix, snapshot->exten, prefix, snapshot->exten,
prefix, snapshot->priority, prefix, snapshot->priority,
prefix, snapshot->uniqueid); prefix, snapshot->uniqueid,
prefix, snapshot->linkedid);
if (!res) { if (!res) {
ast_free(out); ast_free(out);