diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:27:10 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:27:10 -0500 |
commit | 472b277207219d791a399d4d449af6ffdf00a081 (patch) | |
tree | 5a174ebfac759081c1c6c2adf614c43cc75325c3 /src/or/circuitbuild.c | |
parent | e167a0e17d9211205651b07b65b0e83695bf6cf1 (diff) | |
download | tor-472b277207219d791a399d4d449af6ffdf00a081.tar.gz tor-472b277207219d791a399d4d449af6ffdf00a081.zip |
Remove the (no longer compiled) code for legacy guard selection.
Part of 20830.
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r-- | src/or/circuitbuild.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index d4e30196cc..91bd823451 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2308,26 +2308,6 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state, * family. */ nodelist_add_node_and_family(excluded, node); } -#ifdef ENABLE_LEGACY_GUARD_ALGORITHM - /* and exclude current entry guards and their families, - * unless we're in a test network, and excluding guards - * would exclude all nodes (i.e. we're in an incredibly small tor network, - * or we're using TestingAuthVoteGuard *). - * This is an incomplete fix, but is no worse than the previous behaviour, - * and only applies to minimal, testing tor networks - * (so it's no less secure) */ - if (options->UseEntryGuards - && (!options->TestingTorNetwork || - smartlist_len(nodelist_get_list()) > smartlist_len(get_entry_guards()) - )) { - SMARTLIST_FOREACH(get_entry_guards(), const entry_guard_t *, entry, - { - if ((node = entry_guard_find_node(entry))) { - nodelist_add_node_and_family(excluded, node); - } - }); - } -#endif if (state) { if (state->need_uptime) |