mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Exclude test and a supporting function when evdns_base_get_nameserver_addr() is not available

Browse source
This commit is contained in:
rl1987 2018-10-20 20:32:26 +03:00
parent 92f0e04f8d
commit 98cef6807e
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/feature/relay/dns.c
View file

@ -1366,6 +1366,7 @@ number_of_configured_nameservers(void)
return evdns_base_count_nameservers(the_evdns_base); 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> * Return address of configured nameserver in <b>the_evdns_base</b>
* at index <b>idx</b>. * at index <b>idx</b>.
@ -1386,6 +1387,7 @@ configured_nameserver_address(const size_t idx)
return NULL; return NULL;
} }
#endif
/** Configure eventdns nameservers if force is true, or if the configuration /** 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 * has changed since the last time we called this function, or if we failed on

2
src/feature/relay/dns.h
View file

@ -46,7 +46,9 @@ size_t dns_cache_handle_oom(time_t now, size_t min_remove_bytes);
#include "feature/relay/dns_structs.h" #include "feature/relay/dns_structs.h"
size_t number_of_configured_nameservers(void); size_t number_of_configured_nameservers(void);
#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR
tor_addr_t *configured_nameserver_address(const size_t idx); tor_addr_t *configured_nameserver_address(const size_t idx);
#endif
MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn, MOCK_DECL(STATIC int,dns_resolve_impl,(edge_connection_t *exitconn,
int is_resolve,or_circuit_t *oncirc, char **hostname_out, int is_resolve,or_circuit_t *oncirc, char **hostname_out,

5
src/test/test_dns.c
View file

@ -1,6 +1,7 @@
/* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* Copyright (c) 2015-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */ /* See LICENSE for licensing information */
#include "orconfig.h"
#include "core/or/or.h" #include "core/or/or.h"
#include "test/test.h" #include "test/test.h"
@ -21,6 +22,7 @@
#define NS_MODULE dns #define NS_MODULE dns
#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR
#define NS_SUBMODULE configure_nameservers_fallback #define NS_SUBMODULE configure_nameservers_fallback
static or_options_t options = { static or_options_t options = {
@ -75,6 +77,7 @@ NS(test_main)(void *arg)
} }
#undef NS_SUBMODULE #undef NS_SUBMODULE
#endif
#define NS_SUBMODULE clip_ttl #define NS_SUBMODULE clip_ttl
@ -796,7 +799,9 @@ NS(test_main)(void *arg)
#undef NS_SUBMODULE #undef NS_SUBMODULE
struct testcase_t dns_tests[] = { struct testcase_t dns_tests[] = {
#ifdef HAVE_EVDNS_BASE_GET_NAMESERVER_ADDR
TEST_CASE(configure_nameservers_fallback), TEST_CASE(configure_nameservers_fallback),
#endif
TEST_CASE(clip_ttl), TEST_CASE(clip_ttl),
TEST_CASE(resolve), TEST_CASE(resolve),
TEST_CASE_ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve), TEST_CASE_ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve),