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

Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min

Browse Source 
In that chutney test, the bridge client is configured to connect to
the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no
change in transports.

That meant, I think, that the descriptor is only assigned to the
first bridge when it arrives, and never the second.
This commit is contained in:
Nick Mathewson 2017-03-01 15:02:16 -05:00
parent 18a98206ed
commit 5298ab5917
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/entrynodes.c
View File

@ -3365,7 +3365,14 @@ guard_selection_have_enough_dir_info_to_build_circuits(guard_selection_t *gs)
* guards in our list, since these are the guards that we typically use for
* circuits. */
num_primary_to_check = get_n_primary_guards_to_use(GUARD_USAGE_TRAFFIC);
num_primary_to_check++;
/*
We had added this to try to guarantee that we'd not normally try a guard
without a descriptor, even if we didn't use the first guard. But it led
to problems with the chutney bridges+ipv6-min test. A better solution is
needed.
num_primary_to_check++;
*/
SMARTLIST_FOREACH_BEGIN(gs->primary_entry_guards, entry_guard_t *, guard) {
entry_guard_consider_retry(guard);