summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2015-06-23 14:34:29 -0500
committerRichard Mudgett <rmudgett@digium.com>2015-06-26 10:34:31 -0500
commitc2d48a2a28825046d9f52ceefc82c157d7595b6b (patch)
treec49ce306680cffefd326da459a02b4c1f0a814b5
parent3f1fe83633e644be8a9983df50ce2213f63a5f9a (diff)
AMI: Add Linkedid to the standard channel snapshot AMI event headers.
ASTERISK-25189 #close Reported by: John Hardin Change-Id: I2b1778c3fdc1dca0ed55db4e3a639eddfb16c2ac
-rw-r--r--CHANGES3
-rw-r--r--doc/appdocsxml.xslt6
-rw-r--r--main/manager_channels.c6
3 files changed, 13 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index d2fa84c02..cf37e6991 100644
--- a/CHANGES
+++ b/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
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/main/manager_channels.c b/main/manager_channels.c
index da7eebaad..da9bf476d 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);