<p>Kevin Harwell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11465">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_mwi_external: Update to use new MWI state publishing API<br><br>MWI recently received some new API calls to help manage topic subscriptions<br>and publishing for associated state. This patch updates res_mwi_external to use<br>the new publishing mechanisms.<br><br>ASTERISK-28442<br><br>Change-Id: I07d41f1a0f0a0bae2e3621adf36057fa416a9bc9<br>---<br>M res/res_mwi_external.c<br>1 file changed, 20 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/65/11465/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c</span><br><span>index 9d56558..4a2c4c2 100644</span><br><span>--- a/res/res_mwi_external.c</span><br><span>+++ b/res/res_mwi_external.c</span><br><span>@@ -78,6 +78,8 @@</span><br><span>  unsigned int msgs_new;</span><br><span>       /*! Number of old messages in mailbox. */</span><br><span>    unsigned int msgs_old;</span><br><span style="color: hsl(120, 100%, 40%);">+        /*! State publisher object */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_mwi_publisher *publisher;</span><br><span> };</span><br><span> </span><br><span> static struct ast_sorcery *mwi_sorcery;</span><br><span>@@ -91,8 +93,8 @@</span><br><span>  */</span><br><span> static void mwi_post_event(const struct ast_mwi_mailbox_object *mailbox)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   ast_publish_mwi_state(ast_sorcery_object_get_id(mailbox), NULL,</span><br><span style="color: hsl(0, 100%, 40%);">-         mailbox->msgs_new, mailbox->msgs_old);</span><br><span style="color: hsl(120, 100%, 40%);">+  ast_mwi_publish(mailbox->publisher, 0, mailbox->msgs_new,</span><br><span style="color: hsl(120, 100%, 40%);">+               mailbox->msgs_old, NULL, NULL);</span><br><span> }</span><br><span> </span><br><span> static void mwi_observe_update(const void *obj)</span><br><span>@@ -111,13 +113,9 @@</span><br><span> {</span><br><span>   const struct ast_mwi_mailbox_object *mailbox = obj;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (mailbox->msgs_new || mailbox->msgs_old) {</span><br><span style="color: hsl(0, 100%, 40%);">-             /* Post a count clearing event. */</span><br><span style="color: hsl(0, 100%, 40%);">-              ast_publish_mwi_state(ast_sorcery_object_get_id(mailbox), NULL, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(120, 100%, 40%);">+     mwi_post_event(mailbox);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* Post a cache remove event. */</span><br><span style="color: hsl(0, 100%, 40%);">-        ast_delete_mwi_state(ast_sorcery_object_get_id(mailbox), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+       ao2_cleanup(mailbox->publisher);</span><br><span> }</span><br><span> </span><br><span> static const struct ast_sorcery_observer mwi_observers = {</span><br><span>@@ -129,7 +127,20 @@</span><br><span> /*! \brief Internal function to allocate a mwi object */</span><br><span> static void *mwi_sorcery_object_alloc(const char *id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     return ast_sorcery_generic_alloc(sizeof(struct ast_mwi_mailbox_object), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+        struct ast_mwi_mailbox_object *mailbox;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     mailbox = ast_sorcery_generic_alloc(sizeof(struct ast_mwi_mailbox_object), NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+     if (!mailbox) {</span><br><span style="color: hsl(120, 100%, 40%);">+               return NULL;</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%);">+   mailbox->publisher = ast_mwi_add_publisher(id);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (!mailbox->publisher) {</span><br><span style="color: hsl(120, 100%, 40%);">+         ao2_ref(mailbox, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+         return NULL;</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%);">+   return mailbox;</span><br><span> }</span><br><span> </span><br><span> /*!</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11465">change 11465</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/+/11465"/><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: I07d41f1a0f0a0bae2e3621adf36057fa416a9bc9 </div>
<div style="display:none"> Gerrit-Change-Number: 11465 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>