mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-19 18:00:33 +01:00
Code Issues Projects Releases Wiki Activity

Preemptive circs should work with UseEntryGuards 0

Browse Source 
Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature with
that config setting (in our fix for #24469), leading to slower load times.

Fixes bug 34303; bugfix on 0.3.3.2-alpha.
This commit is contained in:
Roger Dingledine 2020-05-30 01:54:22 -04:00
parent a59d54756f
commit 39f2411b3f
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug34303 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (client performance):
- Resume being willing to use preemptively-built circuits when
UseEntryGuards is set to 0. We accidentally disabled this feature
with that config setting, leading to slower load times. Fixes bug
34303; bugfix on 0.3.3.2-alpha.

2
src/core/or/circuitlist.c
View File

@ -1883,7 +1883,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce, extend_info_t *info,
}
/* Ignore any circuits for which we can't use the Guard. It is possible
* that the Guard was removed from the samepled set after the circuit
* that the Guard was removed from the sampled set after the circuit
* was created so avoid using it. */
if (!entry_guard_could_succeed(circ->guard_state)) {
goto next;

8
src/feature/client/entrynodes.c
View File

@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state)
entry_guards_dirty = 0;
}
/** Return true iff the circuit's guard can succeed that is can be used. */
/** Return true iff the circuit's guard can succeed, that is, can be used. */
int
entry_guard_could_succeed(const circuit_guard_state_t *guard_state)
{
if (get_options()->UseEntryGuards == 0) {
/* we're fine with this circuit's first hop, because we're not
* configured to use entry guards. */
return 1;
}
if (!guard_state) {
return 0;
}