nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make populate_live_entry_guards() more smoothly testable.

Browse Source
This commit is contained in:
George Kadianakis 2014-06-09 19:14:40 +01:00
parent c7b05a6aef
commit 71da44f159
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/entrynodes.c
View File

@ -999,6 +999,7 @@ choose_random_dirguard(dirinfo_type_t type)
Return 1 if we should choose a guard right away. */ Return 1 if we should choose a guard right away. */
static int static int
populate_live_entry_guards(smartlist_t *live_entry_guards, populate_live_entry_guards(smartlist_t *live_entry_guards,
const smartlist_t *all_entry_guards,
const node_t *chosen_exit, const node_t *chosen_exit,
dirinfo_type_t dirinfo_type, dirinfo_type_t dirinfo_type,
int for_directory, int for_directory,
@ -1011,13 +1012,13 @@ populate_live_entry_guards(smartlist_t *live_entry_guards,
int retval = 0; int retval = 0;
int need_descriptor = !for_directory; int need_descriptor = !for_directory;
tor_assert(entry_guards); tor_assert(all_entry_guards);
if (chosen_exit) { if (chosen_exit) {
nodelist_add_node_and_family(exit_family, chosen_exit); nodelist_add_node_and_family(exit_family, chosen_exit);
} }
SMARTLIST_FOREACH_BEGIN(entry_guards, const entry_guard_t *, entry) { SMARTLIST_FOREACH_BEGIN(all_entry_guards, const entry_guard_t *, entry) {
const char *msg; const char *msg;
node = entry_is_live(entry, need_uptime, need_capacity, 0, node = entry_is_live(entry, need_uptime, need_capacity, 0,
need_descriptor, &msg); need_descriptor, &msg);
@ -1090,6 +1091,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory,
/* Populate the list of live entry guards so that we pick one of /* Populate the list of live entry guards so that we pick one of
them. */ them. */
retval = populate_live_entry_guards(live_entry_guards, retval = populate_live_entry_guards(live_entry_guards,
entry_guards,
chosen_exit, chosen_exit,
dirinfo_type, dirinfo_type,
for_directory, for_directory,