diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | UPGRADE.txt | 7 | ||||
| -rw-r--r-- | doc/appdocsxml.xslt | 6 | ||||
| -rw-r--r-- | include/asterisk/manager.h | 2 | ||||
| -rw-r--r-- | main/manager_channels.c | 6 |
5 files changed, 21 insertions, 3 deletions
@@ -17,6 +17,9 @@ AMI * A new ContactStatus event has been added that reflects res_pjsip contact 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 ------------------ * A new 'g726_non_standard' endpoint option has been added that, when set to diff --git a/UPGRADE.txt b/UPGRADE.txt index a78822b20..7824823ea 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -21,6 +21,13 @@ === 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: Source Control: diff --git a/doc/appdocsxml.xslt b/doc/appdocsxml.xslt index 8cbeaa3a5..6e4c5ac50 100644 --- a/doc/appdocsxml.xslt +++ b/doc/appdocsxml.xslt @@ -98,6 +98,12 @@ <xsl:value-of select="concat(@prefix,'Uniqueid')"/> </xsl:attribute> </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 match="bridge_snapshot"> diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 43031d1d6..b5ede545e 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -54,7 +54,7 @@ - \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_TLS_PORT 5039 /* Default port for Asterisk management via TCP */ diff --git a/main/manager_channels.c b/main/manager_channels.c index 552adc763..adef639e8 100644 --- a/main/manager_channels.c +++ b/main/manager_channels.c @@ -435,7 +435,8 @@ struct ast_str *ast_manager_build_channel_state_string_prefix( "%sContext: %s\r\n" "%sExten: %s\r\n" "%sPriority: %d\r\n" - "%sUniqueid: %s\r\n", + "%sUniqueid: %s\r\n" + "%sLinkedid: %s\r\n", prefix, snapshot->name, prefix, 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->exten, prefix, snapshot->priority, - prefix, snapshot->uniqueid); + prefix, snapshot->uniqueid, + prefix, snapshot->linkedid); if (!res) { ast_free(out); |