[PATCH 1/3] iphlpapi: Use res_getservers() if available to get the DNS server list.
Chip Davis
cdavis at codeweavers.com
Sun Apr 5 17:29:00 CDT 2020
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
---
configure.ac | 15 ++++++++++++
dlls/iphlpapi/iphlpapi_main.c | 45 ++++++++++++++++++++++++++++++++++-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 5540d4ecccb..f4e34cf91fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1542,6 +1542,21 @@ then
AC_DEFINE(HAVE_RESOLV, 1)
AC_SUBST(RESOLV_LIBS,$ac_cv_have_resolv) ;;
esac
+
+ if test "x$ac_cv_have_resolv" != "xnot found"
+ then
+ AC_CACHE_CHECK([for res_getservers],wine_cv_have_res_getservers,
+ [ac_save_LIBS="$LIBS"
+ test "x$ac_cv_have_resolv" = "xnone required" || \
+ LIBS="$ac_cv_have_resolv $LIBS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ [[#include <resolv.h>]],[[res_getservers(NULL, NULL, 0);]])],[wine_cv_have_res_getservers=yes],[wine_cv_have_res_getservers=no])
+ LIBS="$ac_save_LIBS"])
+ if test "$wine_cv_have_res_getservers" = "yes"
+ then
+ AC_DEFINE(HAVE_RES_GETSERVERS, 1, [Define to 1 if you have the `res_getservers' function.])
+ fi
+ fi
fi
dnl **** Check for LittleCMS ***
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index b8ae327a134..e3ce21c44b2 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -1249,7 +1249,8 @@ static void sockaddr_in_to_WS_storage( SOCKADDR_STORAGE *dst, const struct socka
}
#if defined(HAVE_STRUCT___RES_STATE__U__EXT_NSCOUNT6) || \
- (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS))
+ (defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)) || \
+ defined(HAVE_RES_GETSERVERS)
static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sockaddr_in6 *src )
{
SOCKADDR_IN6 *s = (SOCKADDR_IN6 *)dst;
@@ -1284,6 +1285,47 @@ static void initialise_resolver(void)
LeaveCriticalSection(&res_init_cs);
}
+#ifdef HAVE_RES_GETSERVERS
+static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )
+{
+ struct __res_state *state = &_res;
+ int i, found = 0, total;
+ SOCKADDR_STORAGE *addr = servers;
+ union res_sockaddr_union *buf;
+
+ initialise_resolver();
+
+ total = res_getservers( state, NULL, 0 );
+
+ if ((!servers || !num) && !ip4_only) return total;
+
+ buf = HeapAlloc( GetProcessHeap(), 0, total * sizeof(union res_sockaddr_union) );
+ total = res_getservers( state, buf, total );
+
+ for (i = 0; i < total; i++)
+ {
+ if (buf[i].sin6.sin6_family == AF_INET6 && ip4_only) continue;
+ if (buf[i].sin.sin_family != AF_INET && buf[i].sin6.sin6_family != AF_INET6) continue;
+
+ found++;
+ if (!servers || !num) continue;
+
+ if (buf[i].sin6.sin6_family == AF_INET6)
+ {
+ sockaddr_in6_to_WS_storage( addr, &buf[i].sin6 );
+ }
+ else
+ {
+ sockaddr_in_to_WS_storage( addr, &buf[i].sin );
+ }
+ if (++addr >= servers + num) break;
+ }
+
+ HeapFree( GetProcessHeap(), 0, buf );
+ return found;
+}
+#else
+
static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )
{
int i, ip6_count = 0;
@@ -1319,6 +1361,7 @@ static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )
}
return addr - servers;
}
+#endif
#elif defined(HAVE___RES_GET_STATE) && defined(HAVE___RES_GETSERVERS)
static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )
--
2.24.0
More information about the wine-devel
mailing list