commit d5d7c3e63843ef4df72c809682ededa9e5c5dbfd Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 15:58:19 2017 -0500

Remove argument from guards_choose_dirguard --- src/or/directory.c | 5 ++--- src/or/entrynodes.c | 14 ++------------ src/or/entrynodes.h | 3 +-- 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 9e41394..43d65dc 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -469,7 +469,7 @@ directory_pick_generic_dirserver(dirinfo_type_t type, int pds_flags, log_warn(LD_BUG, "Called when we have UseBridges set.");

if (should_use_directory_guards(options)) { - const node_t *node = guards_choose_dirguard(type, guard_state_out); + const node_t *node = guards_choose_dirguard(guard_state_out); if (node) rs = node->rs; } else { @@ -559,8 +559,7 @@ MOCK_IMPL(void, directory_get_from_dirserver, ( * sort of dir fetch we'll be doing, so it won't return a bridge * that can't answer our question. */ - const node_t *node = guards_choose_dirguard(type, - &guard_state); + const node_t *node = guards_choose_dirguard(&guard_state); if (node && node->ri) { /* every bridge has a routerinfo. */ routerinfo_t *ri = node->ri; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e99aa00..b8263dd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3123,7 +3123,6 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e) status = "up"; }

- node = entry_guard_find_node(e); if (node) { node_get_verbose_nickname(node, nbuf); @@ -3266,17 +3265,8 @@ guards_choose_guard(cpath_build_state_t *state,

/** Helper: pick a directory guard, with whatever algorithm is used. */ const node_t * -guards_choose_dirguard(dirinfo_type_t info, - circuit_guard_state_t **guard_state_out) -{ - /* XXXX prop271 We don't need to look at the dirinfo_type_t here, - * apparently. If you look at the old implementation, and you follow info - * downwards through choose_random_dirguard(), into - * choose_random_entry_impl(), into populate_live_entry_guards()... you - * find out that it isn't even used, and hasn't been since 0.2.7.1-alpha, - * when we realized that every Tor on the network would support - * microdescriptors. -NM */ - (void) info; +guards_choose_dirguard(circuit_guard_state_t **guard_state_out) +{ const node_t *r = NULL; if (entry_guard_pick_for_circuit(get_guard_selection_info(), GUARD_USAGE_DIRGUARD, diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 2fd11cb..6bbdff1 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -314,8 +314,7 @@ struct circuit_guard_state_t { int guards_update_all(void); const node_t *guards_choose_guard(cpath_build_state_t *state, circuit_guard_state_t **guard_state_out); -const node_t *guards_choose_dirguard(dirinfo_type_t info, - circuit_guard_state_t **guard_state_out); +const node_t *guards_choose_dirguard(circuit_guard_state_t **guard_state_out);

#if 1 /* XXXX NM I would prefer that all of this stuff be private to