<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/13855">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enum.c: Make ast_get_txt() actually do something.<br><br>The ast_get_txt() API function (and by extension, the TXTCIDNAME<br>dialplan function) were broken in<br>65b8381550a9f46fdce84de79960073e9d51b05d such that we would never<br>actually make a DNS TXT query as described.<br><br>This patch restores the documented behavior.<br><br>ASTERISK-19460 #close<br>Reported by: George Joseph<br><br>Change-Id: I1b19aea711488cb1ecd63843cddce05010e39376<br>---<br>M main/enum.c<br>1 file changed, 70 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/55/13855/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/enum.c b/main/enum.c</span><br><span>index e003f07..a9e2d40 100644</span><br><span>--- a/main/enum.c</span><br><span>+++ b/main/enum.c</span><br><span>@@ -932,37 +932,88 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \internal</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Format a phone number as a domain in an ENUM-adjacent way.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Creates a domain name suitable for query by:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * 1. Removing non-digits</span><br><span style="color: hsl(120, 100%, 40%);">+ * 2. Adding a '.' between adjacent digits</span><br><span style="color: hsl(120, 100%, 40%);">+ * 3. Reversing the string</span><br><span style="color: hsl(120, 100%, 40%);">+ * 4. Appending the specified suffix (or e164.arpa if none is specified)</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static char *format_numeric_domain(const char *number, const char *suffix)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char *buffer, *dst;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t suffix_length;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t number_length = strlen(number);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *src = number + number_length - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!suffix) {</span><br><span style="color: hsl(120, 100%, 40%);">+ suffix = "e164.arpa";</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%);">+ suffix_length = strlen(suffix);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dst = buffer = ast_malloc(</span><br><span style="color: hsl(120, 100%, 40%);">+ (number_length * 2) /* We need 2 bytes per input digit */</span><br><span style="color: hsl(120, 100%, 40%);">+ + suffix_length /* ... plus however long the suffix is */</span><br><span style="color: hsl(120, 100%, 40%);">+ + 1 /* ... plus room for the '.' separator */</span><br><span style="color: hsl(120, 100%, 40%);">+ + 1 /* ... and room for the \0 byte at the end */);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buffer) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while (src >= number) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isdigit(*src)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst++ = *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst++ = '.';</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ src--;</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%);">+ /* The length arguments below make sure that the \0 byte is copied into</span><br><span style="color: hsl(120, 100%, 40%);">+ the final string */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*suffix == '.') {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst, &suffix[1], suffix_length);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst, suffix, suffix_length + 1);</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return buffer;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int ast_get_txt(struct ast_channel *chan, const char *number, char *txt, int txtlen, char *suffix)</span><br><span> {</span><br><span> struct txt_context context;</span><br><span style="color: hsl(0, 100%, 40%);">- char tmp[259 + 512];</span><br><span style="color: hsl(0, 100%, 40%);">- int pos = strlen(number) - 1;</span><br><span style="color: hsl(0, 100%, 40%);">- int newpos = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int ret = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *domain;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+ int autoservice = 0;</span><br><span> </span><br><span> ast_debug(4, "ast_get_txt: Number = '%s', suffix = '%s'\n", number, suffix);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pos > 128) {</span><br><span style="color: hsl(0, 100%, 40%);">- pos = 128;</span><br><span style="color: hsl(120, 100%, 40%);">+ domain = format_numeric_domain(number, suffix);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!domain) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- while (pos >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (isdigit(number[pos])) {</span><br><span style="color: hsl(0, 100%, 40%);">- tmp[newpos++] = number[pos];</span><br><span style="color: hsl(0, 100%, 40%);">- tmp[newpos++] = '.';</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- pos--;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* DNS might take a while, so service the channel while we're blocked */</span><br><span style="color: hsl(120, 100%, 40%);">+ autoservice = !ast_autoservice_start(chan);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ast_copy_string(&tmp[newpos], suffix, sizeof(tmp) - newpos);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ret < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(2, "No such number found in ENUM: %s (%s)\n", tmp, strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- ret = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = ast_search_dns(&context, domain, C_IN, T_TXT, txt_callback);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret > 0) {</span><br><span> ast_copy_string(txt, context.txt, txtlen);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(2, "No such number found in ENUM: %s (%s)\n", domain, strerror(errno));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (autoservice) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_autoservice_stop(chan);</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%);">+ ast_free(domain);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /*! \brief Initialize the ENUM support subsystem */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/13855">change 13855</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/+/13855"/><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: I1b19aea711488cb1ecd63843cddce05010e39376 </div>
<div style="display:none"> Gerrit-Change-Number: 13855 </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-MessageType: newchange </div>