<p>Jasper Hafkenscheid has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/10448">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_sip: Send stasis message on invite with replaces<br><br>When a call pickup is performed using and invite with replaces header<br>the expected PICKUP message is now sent.<br><br>ASTERISK-28081 #close<br>Reported-by: Luit van Drongelen<br><br>Change-Id: Ieb1442027a3ce6ae55faca47bc095e53972f947a<br>---<br>M channels/chan_sip.c<br>M include/asterisk/pickup.h<br>M main/pickup.c<br>3 files changed, 23 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/48/10448/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_sip.c b/channels/chan_sip.c</span><br><span>index 34299a8..8d92733 100644</span><br><span>--- a/channels/chan_sip.c</span><br><span>+++ b/channels/chan_sip.c</span><br><span>@@ -25684,7 +25684,15 @@</span><br><span> }</span><br><span> ao2_ref(bridge, -1);</span><br><span> } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_channel_snapshot *, chan_snapshot, NULL, ao2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+ RAII_VAR(struct ast_channel_snapshot *, target_snapshot, NULL, ao2_cleanup);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_snapshot = ast_channel_snapshot_create(c);</span><br><span style="color: hsl(120, 100%, 40%);">+ target_snapshot = ast_channel_snapshot_get_latest(ast_channel_uniqueid(replaces_chan));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ast_channel_move(replaces_chan, c);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_send_call_pickup_stasis_message(replaces_chan, chan_snapshot, target_snapshot);</span><br><span> ast_hangup(c);</span><br><span> }</span><br><span> ast_channel_unref(c);</span><br><span>diff --git a/include/asterisk/pickup.h b/include/asterisk/pickup.h</span><br><span>index 17b38e7..5e2296f 100644</span><br><span>--- a/include/asterisk/pickup.h</span><br><span>+++ b/include/asterisk/pickup.h</span><br><span>@@ -58,6 +58,19 @@</span><br><span> */</span><br><span> int ast_pickup_call(struct ast_channel *chan);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct ast_channel_snapshot;</span><br><span style="color: hsl(120, 100%, 40%);">+/*!</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Send a pickup stasis message</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param picking_up channel that initiated pickup.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param chan snapshot of channel that initiated pickup.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param target snapshot of channel to be picked up.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval 0 on success.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \retval -1 on failure.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_send_call_pickup_stasis_message(struct ast_channel *picking_up, struct ast_channel_snapshot *chan, struct ast_channel_snapshot *target);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*!</span><br><span> * \brief Pickup a call target.</span><br><span> *</span><br><span>diff --git a/main/pickup.c b/main/pickup.c</span><br><span>index 6f1e0f1..87a7533 100644</span><br><span>--- a/main/pickup.c</span><br><span>+++ b/main/pickup.c</span><br><span>@@ -277,7 +277,7 @@</span><br><span> return res;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int send_call_pickup_stasis_message(struct ast_channel *picking_up, struct ast_channel_snapshot *chan, struct ast_channel_snapshot *target)</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_send_call_pickup_stasis_message(struct ast_channel *picking_up, struct ast_channel_snapshot *chan, struct ast_channel_snapshot *target)</span><br><span> {</span><br><span> RAII_VAR(struct ast_multi_channel_blob *, pickup_payload, NULL, ao2_cleanup);</span><br><span> RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);</span><br><span>@@ -377,7 +377,7 @@</span><br><span> }</span><br><span> </span><br><span> /* target points to the channel that did the pickup at this point, so use that channel's topic instead of chan */</span><br><span style="color: hsl(0, 100%, 40%);">- send_call_pickup_stasis_message(target, chan_snapshot, target_snapshot);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_send_call_pickup_stasis_message(target, chan_snapshot, target_snapshot);</span><br><span> </span><br><span> res = 0;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10448">change 10448</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/10448"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ieb1442027a3ce6ae55faca47bc095e53972f947a </div>
<div style="display:none"> Gerrit-Change-Number: 10448 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jasper Hafkenscheid <jasper.hafkenscheid@wearespindle.com> </div>