<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16415">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">dns.c: Load IPv6 DNS resolvers if configured.<br><br>IPv6 nameserver addresses are stored in different part of the<br>__res_state structure, so look there if we appear to have support for<br>it.<br><br>ASTERISK-28004 #close<br><br>Change-Id: I67067077d8a406ee996664518d9c8fbf11f6977d<br>---<br>M configure<br>M configure.ac<br>M include/asterisk/autoconfig.h.in<br>M main/dns.c<br>4 files changed, 32 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/15/16415/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 7d45eb8..d6ae579 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -18657,6 +18657,17 @@</span><br><span> fi</span><br><span> rm -f core conftest.err conftest.$ac_objext \</span><br><span> conftest$ac_exeext conftest.$ac_ext</span><br><span style="color: hsl(120, 100%, 40%);">+ ac_fn_c_check_member "$LINENO" "struct __res_state" "_u._ext.nsaddrs" "ac_cv_member_struct___res_state__u__ext_nsaddrs" "#include <resolv.h></span><br><span style="color: hsl(120, 100%, 40%);">+"</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x$ac_cv_member_struct___res_state__u__ext_nsaddrs" = xyes; then :</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cat >>confdefs.h <<_ACEOF</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS 1</span><br><span style="color: hsl(120, 100%, 40%);">+_ACEOF</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%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> else</span><br><span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5</span><br><span> $as_echo "no" >&6; }</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index ea6080d..e61a96f 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -1459,7 +1459,8 @@</span><br><span> AC_MSG_RESULT(yes)</span><br><span> AC_DEFINE([HAVE_RES_CLOSE], 1, [Define to 1 if your system has the close resolver function.]),</span><br><span> AC_MSG_RESULT(no)</span><br><span style="color: hsl(0, 100%, 40%);">- ),</span><br><span style="color: hsl(120, 100%, 40%);">+ )</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_CHECK_MEMBERS([struct __res_state._u._ext.nsaddrs], [], [], [[#include <resolv.h>]]),</span><br><span> AC_MSG_RESULT(no)</span><br><span> )</span><br><span> </span><br><span>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in</span><br><span>index fc3a9bd..776074d 100644</span><br><span>--- a/include/asterisk/autoconfig.h.in</span><br><span>+++ b/include/asterisk/autoconfig.h.in</span><br><span>@@ -1052,6 +1052,9 @@</span><br><span> /* Define to 1 if `uid' is a member of `struct ucred'. */</span><br><span> #undef HAVE_STRUCT_UCRED_UID</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Define to 1 if `_u._ext.nsaddrs' is a member of `struct __res_state'. */</span><br><span style="color: hsl(120, 100%, 40%);">+#undef HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Define to 1 if you have the `swapctl' function. */</span><br><span> #undef HAVE_SWAPCTL</span><br><span> </span><br><span>diff --git a/main/dns.c b/main/dns.c</span><br><span>index 782d4a8..9cf0cf4 100644</span><br><span>--- a/main/dns.c</span><br><span>+++ b/main/dns.c</span><br><span>@@ -605,7 +605,22 @@</span><br><span> #endif</span><br><span> </span><br><span> for (i = 0; i < state->nscount; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_str_container_add(nameservers, ast_inet_ntoa(state->nsaddr_list[i].sin_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ char addr[INET6_ADDRSTRLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *addrp = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* glibc sets sin_family to 0 when the nameserver is an IPv6 address */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (state->nsaddr_list[i].sin_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ addrp = inet_ntop(AF_INET, &state->nsaddr_list[i].sin_addr, addr, sizeof(addr));</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(HAVE_RES_NINIT) && defined(HAVE_STRUCT___RES_STATE__U__EXT_NSADDRS)</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (state->_u._ext.nsaddrs[i]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ addrp = inet_ntop(AF_INET6, &state->_u._ext.nsaddrs[i]->sin6_addr, addr, sizeof(addr));</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</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%);">+ if (addrp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(1, "Discovered nameserver: %s\n", addrp);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_str_container_add(nameservers, addrp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> #ifdef HAVE_RES_NINIT</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16415">change 16415</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/+/16415"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 19 </div>
<div style="display:none"> Gerrit-Change-Id: I67067077d8a406ee996664518d9c8fbf11f6977d </div>
<div style="display:none"> Gerrit-Change-Number: 16415 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>