<p>Moritz Fain has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18413">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ARI channels: exposed channel driver's unique id (which is the Call-ID for SIP/PJSIP) to ARI channel resource as 'pvt_id'<br><br>ASTERISK-30027<br><br>Change-Id: I7cc6e7a9d29efe74bc27811d788dac20fe559b87<br>---<br>M channels/chan_pjsip.c<br>M include/asterisk/stasis_channels.h<br>M main/dial.c<br>M main/stasis_channels.c<br>4 files changed, 18 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/13/18413/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c</span><br><span>index 61c4cfb..3bd672f 100644</span><br><span>--- a/channels/chan_pjsip.c</span><br><span>+++ b/channels/chan_pjsip.c</span><br><span>@@ -572,6 +572,7 @@</span><br><span> }</span><br><span> </span><br><span> ast_channel_tech_pvt_set(chan, channel);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_snapshot_invalidate_segment(chan, AST_CHANNEL_SNAPSHOT_INVALIDATE_BASE);</span><br><span> </span><br><span> if (!ast_stream_topology_get_count(session->pending_media_state->topology) ||</span><br><span> !compatible_formats_exist(session->pending_media_state->topology, session->endpoint->media.codecs)) {</span><br><span>@@ -1273,7 +1274,7 @@</span><br><span> struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(ast);</span><br><span> char *uniqueid = ast_threadstorage_get(&uniqueid_threadbuf, UNIQUEID_BUFSIZE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!uniqueid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!channel || !uniqueid) {</span><br><span> return "";</span><br><span> }</span><br><span> </span><br><span>diff --git a/include/asterisk/stasis_channels.h b/include/asterisk/stasis_channels.h</span><br><span>index 80c79eb..a493c5d 100644</span><br><span>--- a/include/asterisk/stasis_channels.h</span><br><span>+++ b/include/asterisk/stasis_channels.h</span><br><span>@@ -103,12 +103,13 @@</span><br><span> */</span><br><span> struct ast_channel_snapshot_base {</span><br><span> AST_DECLARE_STRING_FIELDS(</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(name); /*!< ASCII unique channel name */</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(uniqueid); /*!< Unique Channel Identifier */</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(accountcode); /*!< Account code for billing */</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(userfield); /*!< Userfield for CEL billing */</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(language); /*!< The default spoken language for the channel */</span><br><span style="color: hsl(0, 100%, 40%);">- AST_STRING_FIELD(type); /*!< Type of channel technology */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(name); /*!< ASCII unique channel name */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(uniqueid); /*!< Unique Channel Identifier */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(pvt_uniqueid); /*!< Channel drivers unique id */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(accountcode); /*!< Account code for billing */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(userfield); /*!< Userfield for CEL billing */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(language); /*!< The default spoken language for the channel */</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_STRING_FIELD(type); /*!< Type of channel technology */</span><br><span> );</span><br><span> struct timeval creationtime; /*!< The time of channel creation */</span><br><span> int tech_properties; /*!< Properties of the channel's technology */</span><br><span>diff --git a/main/dial.c b/main/dial.c</span><br><span>index c40b7fb..2e53ac0 100644</span><br><span>--- a/main/dial.c</span><br><span>+++ b/main/dial.c</span><br><span>@@ -414,6 +414,7 @@</span><br><span> ast_channel_unlock(chan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_channel_snapshot_invalidate_segment(channel->owner, AST_CHANNEL_SNAPSHOT_INVALIDATE_BASE);</span><br><span> ast_channel_stage_snapshot_done(channel->owner);</span><br><span> ast_channel_unlock(channel->owner);</span><br><span> </span><br><span>diff --git a/main/stasis_channels.c b/main/stasis_channels.c</span><br><span>index 8becf96..96f5caf 100644</span><br><span>--- a/main/stasis_channels.c</span><br><span>+++ b/main/stasis_channels.c</span><br><span>@@ -283,6 +283,11 @@</span><br><span> ast_string_field_set(snapshot, accountcode, ast_channel_accountcode(chan));</span><br><span> ast_string_field_set(snapshot, userfield, ast_channel_userfield(chan));</span><br><span> ast_string_field_set(snapshot, uniqueid, ast_channel_uniqueid(chan));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_channel_tech(chan)->get_pvt_uniqueid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(snapshot, pvt_uniqueid, ast_strdupa(ast_channel_tech(chan)->get_pvt_uniqueid(chan)));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(snapshot, pvt_uniqueid, ast_channel_uniqueid(chan));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> ast_string_field_set(snapshot, language, ast_channel_language(chan));</span><br><span> </span><br><span> snapshot->creationtime = ast_channel_creationtime(chan);</span><br><span>@@ -1266,14 +1271,15 @@</span><br><span> }</span><br><span> </span><br><span> json_chan = ast_json_pack(</span><br><span style="color: hsl(0, 100%, 40%);">- /* Broken up into groups of three for readability */</span><br><span style="color: hsl(0, 100%, 40%);">- "{ s: s, s: s, s: s,"</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Broken up into groups for readability */</span><br><span style="color: hsl(120, 100%, 40%);">+ "{ s: s, s: s, s: s, s: s,"</span><br><span> " s: o, s: o, s: s,"</span><br><span> " s: o, s: o, s: s }",</span><br><span> /* First line */</span><br><span> "id", snapshot->base->uniqueid,</span><br><span> "name", snapshot->base->name,</span><br><span> "state", ast_state2str(snapshot->state),</span><br><span style="color: hsl(120, 100%, 40%);">+ "pvt_id", snapshot->base->pvt_uniqueid,</span><br><span> /* Second line */</span><br><span> "caller", ast_json_name_number(</span><br><span> snapshot->caller->name, snapshot->caller->number),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18413">change 18413</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18413"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7cc6e7a9d29efe74bc27811d788dac20fe559b87 </div>
<div style="display:none"> Gerrit-Change-Number: 18413 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Moritz Fain <moritz@fain.io> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>