diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:58:19 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:58:19 -0500 |
| commit | d5d7c3e63843ef4df72c809682ededa9e5c5dbfd (patch) | |
| tree | 5574bc9f5a46a35e1479bde06890bbc710b900d3 /src/or/entrynodes.c | |
| parent | 3efe8bb8ac6c1b62cc488e72b890b699f2fe7081 (diff) | |
| download | tor-d5d7c3e63843ef4df72c809682ededa9e5c5dbfd.tar.gz tor-d5d7c3e63843ef4df72c809682ededa9e5c5dbfd.zip | |
Remove argument from guards_choose_dirguard
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index e99aa00092..b8263dd166 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, |