<p>Benjamin Keith Ford has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16662">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pbx.c: Store hints by name.<br><br>When reloading dialplan, hints created dynamically would lose any dash<br>characters. Now the name is stored, so use that when performing a reload<br>instead of the exten.<br><br>Change-Id: I95e48f5a268efa3c6840ab69798525d3dce91636<br>---<br>M main/pbx.c<br>1 file changed, 7 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/62/16662/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/pbx.c b/main/pbx.c</span><br><span>index d0ee127..492ad71 100644</span><br><span>--- a/main/pbx.c</span><br><span>+++ b/main/pbx.c</span><br><span>@@ -6278,6 +6278,7 @@</span><br><span> </span><br><span> struct store_hint {</span><br><span>  char *context;</span><br><span style="color: hsl(120, 100%, 40%);">+        char *name;</span><br><span>  char *exten;</span><br><span>         AST_LIST_HEAD_NOLOCK(, ast_state_cb) callbacks;</span><br><span>      int laststate;</span><br><span>@@ -6463,7 +6464,6 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* XXX this does not check that multiple contexts are merged */</span><br><span> void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_hashtab *exttable, const char *registrar)</span><br><span> {</span><br><span>@@ -6538,7 +6538,7 @@</span><br><span>                      }</span><br><span> </span><br><span>                        exten_len = strlen(hint->exten->exten) + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-                       length = exten_len + strlen(hint->exten->parent->name) + 1</span><br><span style="color: hsl(120, 100%, 40%);">+                   length = strlen(hint->exten->name) + 1 + exten_len + strlen(hint->exten->parent->name) + 1</span><br><span>                            + sizeof(*saved_hint);</span><br><span>                       if (!(saved_hint = ast_calloc(1, length))) {</span><br><span>                                 ao2_unlock(hint);</span><br><span>@@ -6559,6 +6559,9 @@</span><br><span>                    strcpy(saved_hint->data, hint->exten->parent->name);</span><br><span>                     saved_hint->exten = saved_hint->data + strlen(saved_hint->context) + 1;</span><br><span>                     ast_copy_string(saved_hint->exten, hint->exten->exten, exten_len);</span><br><span style="color: hsl(120, 100%, 40%);">+                   saved_hint->name = saved_hint->data + strlen(saved_hint->context) + strlen(saved_hint->exten) + 2;</span><br><span style="color: hsl(120, 100%, 40%);">+                        strcpy(saved_hint->name, hint->exten->name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                      if (hint->last_presence_subtype) {</span><br><span>                                saved_hint->last_presence_subtype = ast_strdup(hint->last_presence_subtype);</span><br><span>                   }</span><br><span>@@ -6595,12 +6598,12 @@</span><br><span>           * individual extension, because the pattern will no longer match first.</span><br><span>              */</span><br><span>          if (exten && exten->exten[0] == '_') {</span><br><span style="color: hsl(0, 100%, 40%);">-                       ast_add_extension_nolock(exten->parent->name, 0, saved_hint->exten,</span><br><span style="color: hsl(120, 100%, 40%);">+                  ast_add_extension_nolock(exten->parent->name, 0, saved_hint->name,</span><br><span>                          PRIORITY_HINT, NULL, 0, exten->app, ast_strdup(exten->data), ast_free_ptr,</span><br><span>                             exten->registrar);</span><br><span>                        /* rwlocks are not recursive locks */</span><br><span>                        exten = ast_hint_extension_nolock(NULL, saved_hint->context,</span><br><span style="color: hsl(0, 100%, 40%);">-                         saved_hint->exten);</span><br><span style="color: hsl(120, 100%, 40%);">+                                saved_hint->name);</span><br><span>                }</span><br><span> </span><br><span>                /* Find the hint in the hints container */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16662">change 16662</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/+/16662"/><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: I95e48f5a268efa3c6840ab69798525d3dce91636 </div>
<div style="display:none"> Gerrit-Change-Number: 16662 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>