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

CHANGES

@@ -186,6 +186,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

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">

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);