commit 98cef6807eb70e7c459f6f80a06f894fac63100a Author: rl1987 rl1987@sdf.lonestar.org Date: Sat Oct 20 20:32:26 2018 +0300

Exclude test and a supporting function when evdns_base_get_nameserver_addr() is not available --- src/feature/relay/dns.c | 2 ++ src/feature/relay/dns.h | 2 ++ src/test/test_dns.c | 5 +++++ 3 files changed, 9 insertions(+)

diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 1b4914b49..dfd84652a 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -1366,6 +1366,7 @@ number_of_configured_nameservers(void) return evdns_base_count_nameservers(the_evdns_base); }

+#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR /** * Return address of configured nameserver in <b>the_evdns_base</b> * at index <b>idx</b>. @@ -1386,6 +1387,7 @@ configured_nameserver_address(const size_t idx)

return NULL; } +#endif

/** Configure eventdns nameservers if force is true, or if the configuration * has changed since the last time we called this function, or if we failed on diff --git a/src/feature/relay/dns.h b/src/feature/relay/dns.h index 3a17ea7b3..5758ea436 100644 --- a/src/feature/relay/dns.h +++ b/src/feature/relay/dns.h @@ -46,7 +46,9 @@ size_t dns_cache_handle_oom(time_t now, size_t min_remove_bytes); #include "feature/relay/dns_structs.h"

size_t number_of_configured_nameservers(void); +#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR tor_addr_t *configured_nameserver_address(const size_t idx); +#endif

MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn, int is_resolve,or_circuit_t *oncirc, char **hostname_out, diff --git a/src/test/test_dns.c b/src/test/test_dns.c index ea59a49b5..ea0fcf8c5 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -1,6 +1,7 @@ /* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */

+#include "orconfig.h" #include "core/or/or.h" #include "test/test.h"

@@ -21,6 +22,7 @@

#define NS_MODULE dns

+#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR #define NS_SUBMODULE configure_nameservers_fallback

static or_options_t options = { @@ -75,6 +77,7 @@ NS(test_main)(void *arg) }

#undef NS_SUBMODULE +#endif

#define NS_SUBMODULE clip_ttl

@@ -796,7 +799,9 @@ NS(test_main)(void *arg) #undef NS_SUBMODULE

struct testcase_t dns_tests[] = { +#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR TEST_CASE(configure_nameservers_fallback), +#endif TEST_CASE(clip_ttl), TEST_CASE(resolve), TEST_CASE_ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve),