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

Remove argument from guards_choose_dirguard

Browse Source
This commit is contained in:
Nick Mathewson 2017-01-18 15:58:19 -05:00
parent 3efe8bb8ac
commit d5d7c3e638
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/directory.c
View File

@ -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."); log_warn(LD_BUG, "Called when we have UseBridges set.");
if (should_use_directory_guards(options)) { 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) if (node)
rs = node->rs; rs = node->rs;
} else { } 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 * sort of dir fetch we'll be doing, so it won't return a bridge
* that can't answer our question. * that can't answer our question.
*/ */
const node_t *node = guards_choose_dirguard(type, const node_t *node = guards_choose_dirguard(&guard_state);
&guard_state);
if (node && node->ri) { if (node && node->ri) {
/* every bridge has a routerinfo. */ /* every bridge has a routerinfo. */
routerinfo_t *ri = node->ri; routerinfo_t *ri = node->ri;

12
src/or/entrynodes.c
View File

@ -3123,7 +3123,6 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e)
status = "up"; status = "up";
} }
node = entry_guard_find_node(e); node = entry_guard_find_node(e);
if (node) { if (node) {
node_get_verbose_nickname(node, nbuf); 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. */ /** Helper: pick a directory guard, with whatever algorithm is used. */
const node_t * const node_t *
guards_choose_dirguard(dirinfo_type_t info, guards_choose_dirguard(circuit_guard_state_t **guard_state_out)
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;
const node_t *r = NULL; const node_t *r = NULL;
if (entry_guard_pick_for_circuit(get_guard_selection_info(), if (entry_guard_pick_for_circuit(get_guard_selection_info(),
GUARD_USAGE_DIRGUARD, GUARD_USAGE_DIRGUARD,

3
src/or/entrynodes.h
View File

@ -314,8 +314,7 @@ struct circuit_guard_state_t {
int guards_update_all(void); int guards_update_all(void);
const node_t *guards_choose_guard(cpath_build_state_t *state, const node_t *guards_choose_guard(cpath_build_state_t *state,
circuit_guard_state_t **guard_state_out); circuit_guard_state_t **guard_state_out);
const node_t *guards_choose_dirguard(dirinfo_type_t info, const node_t *guards_choose_dirguard(circuit_guard_state_t **guard_state_out);
circuit_guard_state_t **guard_state_out);
#if 1 #if 1
/* XXXX NM I would prefer that all of this stuff be private to /* XXXX NM I would prefer that all of this stuff be private to