<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13545">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip_config_wizard: Fix change detection for wizard settings<br><br>ast_sorcery_changeset_create() is not commutative and will fail to detect<br>differences between two variable lists depending on what changed, so switch to<br>ast_variable_lists_match().<br><br>ASTERISK-28492 #close<br>Reported by: Jean-Denis Girard<br><br>Change-Id: I7b3256983ddfaa2138d3de92a444a53b5193a4e1<br>---<br>M res/res_pjsip_config_wizard.c<br>1 file changed, 3 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip_config_wizard.c b/res/res_pjsip_config_wizard.c</span><br><span>index 4d24922..aec4b58 100644</span><br><span>--- a/res/res_pjsip_config_wizard.c</span><br><span>+++ b/res/res_pjsip_config_wizard.c</span><br><span>@@ -1101,18 +1101,17 @@</span><br><span>      while ((category = ast_category_browse_filtered(cfg, NULL, category, "type=^wizard$"))) {</span><br><span>          const char *id = ast_category_get_name(category);</span><br><span>            struct ast_category *last_cat = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-           struct ast_variable *change_set = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+               int changes = 0;</span><br><span> </span><br><span>                 if (otw->last_config) {</span><br><span>                   last_cat = ast_category_get(otw->last_config, id, "type=^wizard$");</span><br><span style="color: hsl(0, 100%, 40%);">-                        ast_sorcery_changeset_create(ast_category_first(category), ast_category_first(last_cat), &change_set);</span><br><span style="color: hsl(120, 100%, 40%);">+                    changes = !ast_variable_lists_match(ast_category_first(category), ast_category_first(last_cat), 1);</span><br><span>                  if (last_cat) {</span><br><span>                              ast_category_delete(otw->last_config, last_cat);</span><br><span>                  }</span><br><span>            }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           if (!last_cat || change_set) {</span><br><span style="color: hsl(0, 100%, 40%);">-                  ast_variables_destroy(change_set);</span><br><span style="color: hsl(120, 100%, 40%);">+            if (!last_cat || changes) {</span><br><span>                  ast_debug(3, "%s: %s(s) for wizard '%s'\n", reloaded ? "Reload" : "Load", object_type, id);</span><br><span>                    if (wizard_apply_handler(sorcery, otw, category)) {</span><br><span>                          ast_log(LOG_ERROR, "Unable to create objects for wizard '%s'\n", id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13545">change 13545</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/+/13545"/><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: I7b3256983ddfaa2138d3de92a444a53b5193a4e1 </div>
<div style="display:none"> Gerrit-Change-Number: 13545 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.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-MessageType: merged </div>