nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

addr: Static assert resolved address cache size

Browse Source 
This will make sure that we always properly initialize the cache by the exact
size all the time.

Related to #40022

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2020-07-09 13:33:52 -04:00
parent 46e3484261
commit 7bc54ccba9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/config/resolve_addr.c
View File

@ -42,15 +42,17 @@ typedef enum {
} fn_address_ret_t; } fn_address_ret_t;
/** Last resolved addresses. */ /** Last resolved addresses. */
static tor_addr_t last_resolved_addrs[IDX_SIZE] = static tor_addr_t last_resolved_addrs[] =
{ TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL }; { TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL };
CTASSERT(ARRAY_LENGTH(last_resolved_addrs) == IDX_SIZE);
/** Last suggested addresses. /** Last suggested addresses.
* *
* These addresses come from a NETINFO cell from a trusted relay (currently * These addresses come from a NETINFO cell from a trusted relay (currently
* only authorities). We only use those in last resort. */ * only authorities). We only use those in last resort. */
static tor_addr_t last_suggested_addrs[IDX_SIZE] = static tor_addr_t last_suggested_addrs[] =
{ TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL }; { TOR_ADDR_NULL, TOR_ADDR_NULL, TOR_ADDR_NULL };
CTASSERT(ARRAY_LENGTH(last_suggested_addrs) == IDX_SIZE);
static inline int static inline int
af_to_idx(const int family) af_to_idx(const int family)
@ -422,7 +424,9 @@ resolved_addr_set_last(const tor_addr_t *addr, const char *method_used,
const char *hostname_used) const char *hostname_used)
{ {
/** Have we done a first resolve. This is used to control logging. */ /** Have we done a first resolve. This is used to control logging. */
static bool have_resolved_once[IDX_SIZE] = { false, false, false }; static bool have_resolved_once[] = { false, false, false };
CTASSERT(ARRAY_LENGTH(have_resolved_once) == IDX_SIZE);
bool *done_one_resolve; bool *done_one_resolve;
bool have_hostname = false; bool have_hostname = false;
tor_addr_t *last_resolved; tor_addr_t *last_resolved;