From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 23 Jun 2015 19:34:29 +0000 (-0500)
Subject: AMI: Add Linkedid to the standard channel snapshot AMI event headers.
X-Git-Tag: certified/13.1-cert3~129^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3332869b48307d935e9b79b89bbe27d80f21c050;p=thirdparty%2Fasterisk.git

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

ASTERISK-25189 #close
Reported by: John Hardin

Change-Id: I2b1778c3fdc1dca0ed55db4e3a639eddfb16c2ac
---

diff --git a/CHANGES b/CHANGES
index 6dd767e59c..a5076aa45a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,9 +7,20 @@
 === and the other UPGRADE files for older releases.
 ===
 ==============================================================================
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 13.1.0-cert3 to Asterisk 13.1-cert4 --
+------------------------------------------------------------------------------
+
+AMI
+------------------
+ * Added the Linkedid header to the common channel headers listed for each
+   channel in AMI events.
+
 ------------------------------------------------------------------------------
---- Functionality changes from Asterisk 13.1.0 to Asterisk 13.1-cert2 --------
+--- Functionality changes from Asterisk 13.1.0-cert1 to Asterisk 13.1-cert2 --
 ------------------------------------------------------------------------------
+
 res_pjsip
 ------------------
  * A new 'endpoint_identifier_order' option has been added that allows one to
diff --git a/doc/appdocsxml.xslt b/doc/appdocsxml.xslt
index 8cbeaa3a52..6e4c5ac500 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/main/manager_channels.c b/main/manager_channels.c
index 2b9f975fad..c9f048db05 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);