<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13566">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stasis.c: Use correct topic name in stasis_topic_pool_delete_topic<br><br>When a topic is created for an object, its name is only<br><object>:<uniqueid><br>For example:<br>bridge:cb68b3a8-fce7-4738-8a17-d7847562f020<br><br>When a topic is added to a pool, its name has the pool's topic<br>name prepended. For example:<br>bridge:all/bridge:cb68b3a8-fce7-4738-8a17-d7847562f020<br><br>The topic_pool_entry's name however, is only what was passed<br>in to stasis_topic_pool_get_topic which is<br>bridge:cb68b3a8-fce7-4738-8a17-d7847562f020<br>That's actually correct because the entry is qualified by the<br>pool that's in.<br><br>When you're ready to delete the entry from the pool, you retrieve<br>the tropic name from the object but since it now has the pool's<br>topic name prepended, it won't be found in the pool container.<br><br>Fix:<br><br>* Modified stasis_topic_pool_delete_topic() to skip past the<br>pool topic's name, if it was prepended to the topic name,<br>before searching the container for a pool entry.<br><br>ASTERISK-28633<br>Reported by: Joeran Vinzens<br><br>Change-Id: I4396aa69dd83e4ab84c5b91b39293cfdbcf483e6<br>---<br>M include/asterisk/stasis.h<br>M main/stasis.c<br>2 files changed, 18 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/stasis.h b/include/asterisk/stasis.h</span><br><span>index af3e4a6..043757e 100644</span><br><span>--- a/include/asterisk/stasis.h</span><br><span>+++ b/include/asterisk/stasis.h</span><br><span>@@ -911,7 +911,8 @@</span><br><span> * \brief Delete a topic from the topic pool</span><br><span> *</span><br><span> * \param pool Pool from which to delete the topic</span><br><span style="color: hsl(0, 100%, 40%);">- * \param topic_name Name of the topic to delete</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param topic_name Name of the topic to delete in the form of</span><br><span style="color: hsl(120, 100%, 40%);">+ * <pool_topic_name>/<topic_name> or just <topic_name></span><br><span> *</span><br><span> * \since 13.24</span><br><span> * \since 15.6</span><br><span>diff --git a/main/stasis.c b/main/stasis.c</span><br><span>index e570748..ff638bf 100644</span><br><span>--- a/main/stasis.c</span><br><span>+++ b/main/stasis.c</span><br><span>@@ -1711,7 +1711,22 @@</span><br><span> </span><br><span> void stasis_topic_pool_delete_topic(struct stasis_topic_pool *pool, const char *topic_name)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- ao2_find(pool->pool_container, topic_name, OBJ_SEARCH_KEY | OBJ_NODATA | OBJ_UNLINK);</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * The topic_name passed in could be a fully-qualified name like <pool_topic_name>/<topic_name></span><br><span style="color: hsl(120, 100%, 40%);">+ * or just <topic_name>. If it's fully qualified, we need to skip past <pool_topic_name></span><br><span style="color: hsl(120, 100%, 40%);">+ * name and search only on <topic_name>.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *pool_topic_name = stasis_topic_name(pool->pool_topic);</span><br><span style="color: hsl(120, 100%, 40%);">+ int pool_topic_name_len = strlen(pool_topic_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *search_topic_name;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncmp(pool_topic_name, topic_name, pool_topic_name_len) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ search_topic_name = topic_name + pool_topic_name_len + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ search_topic_name = topic_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_find(pool->pool_container, search_topic_name, OBJ_SEARCH_KEY | OBJ_NODATA | OBJ_UNLINK);</span><br><span> }</span><br><span> </span><br><span> struct stasis_topic *stasis_topic_pool_get_topic(struct stasis_topic_pool *pool, const char *topic_name)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13566">change 13566</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/+/13566"/><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-Change-Id: I4396aa69dd83e4ab84c5b91b39293cfdbcf483e6 </div>
<div style="display:none"> Gerrit-Change-Number: 13566 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>