<p>Hendrik Wedhorn has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14889">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_chanspy: Spyee information was missing in ChanSpyStop AMI Event<br><br>The documentation in the wiki says there should be spyee-channel information elements in the ChanSpyStop AMI event.<br><br>https://wiki.asterisk.org/wiki/display/AST/Asterisk+16+ManagerEvent_ChanSpyStop<br><br>However, this is not the case in Asterisk <= 16.10.0 Version. We're using these Spyee* arguments since Asterisk 11.x, so these arguments vanished in Asterisk 12 or higher.<br><br>ASTERISK-28883<br><br>Change-Id: I81ce397a3fd614c094d043ffe5b1b1d76188835f<br>---<br>M apps/app_chanspy.c<br>M main/manager_channels.c<br>2 files changed, 20 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/89/14889/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c</span><br><span>index c66d250..e7693c2 100644</span><br><span>--- a/apps/app_chanspy.c</span><br><span>+++ b/apps/app_chanspy.c</span><br><span>@@ -845,13 +845,13 @@</span><br><span> ast_audiohook_unlock(&csth.spy_audiohook);</span><br><span> ast_audiohook_destroy(&csth.spy_audiohook);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(2, "Done Spying on channel %s\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ publish_chanspy_message(chan, spyee_autochan->chan, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (spyee_bridge_autochan) {</span><br><span> ast_autochan_destroy(spyee_bridge_autochan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_verb(2, "Done Spying on channel %s\n", name);</span><br><span style="color: hsl(0, 100%, 40%);">- publish_chanspy_message(chan, NULL, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return running;</span><br><span> }</span><br><span> </span><br><span>diff --git a/main/manager_channels.c b/main/manager_channels.c</span><br><span>index c964033..80c9e0d 100644</span><br><span>--- a/main/manager_channels.c</span><br><span>+++ b/main/manager_channels.c</span><br><span>@@ -825,23 +825,37 @@</span><br><span> struct stasis_message *message)</span><br><span> {</span><br><span> RAII_VAR(struct ast_str *, spyer_channel_string, NULL, ast_free);</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_str *, spyee_channel_string, NULL, ast_free);</span><br><span> struct ast_channel_snapshot *spyer;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_channel_snapshot *spyee;</span><br><span> struct ast_multi_channel_blob *payload = stasis_message_data(message);</span><br><span> </span><br><span> spyer = ast_multi_channel_blob_get_channel(payload, "spyer_channel");</span><br><span> if (!spyer) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_log(AST_LOG_WARNING, "Received ChanSpy Start event with no spyer channel!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(AST_LOG_WARNING, "Received ChanSpy Stop event with no spyer channel!\n");</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ spyee = ast_multi_channel_blob_get_channel(payload, "spyee_channel");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!spyee) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(AST_LOG_WARNING, "Received ChanSpy Stop event with no spyee channel!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> spyer_channel_string = ast_manager_build_channel_state_string_prefix(spyer, "Spyer");</span><br><span> if (!spyer_channel_string) {</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ spyee_channel_string = ast_manager_build_channel_state_string_prefix(spyee, "Spyee");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!spyee_channel_string) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> manager_event(EVENT_FLAG_CALL, "ChanSpyStop",</span><br><span style="color: hsl(0, 100%, 40%);">- "%s",</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_buffer(spyer_channel_string));</span><br><span style="color: hsl(120, 100%, 40%);">+ "%s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_buffer(spyer_channel_string),</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_buffer(spyee_channel_string));</span><br><span> }</span><br><span> </span><br><span> static void channel_chanspy_start_cb(void *data, struct stasis_subscription *sub,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14889">change 14889</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/+/14889"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I81ce397a3fd614c094d043ffe5b1b1d76188835f </div>
<div style="display:none"> Gerrit-Change-Number: 14889 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hendrik Wedhorn <hwedhorn@addix.net> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>