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

Don't relax the timeout for already opened 1-hop circuits.

Browse Source
This commit is contained in:
Mike Perry 2013-03-27 17:43:27 -07:00 committed by Nick Mathewson
parent 1d49ba84a8
commit d39e6736fe
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/circuituse.c
View File

@ -529,7 +529,12 @@ circuit_expire_building(void)
if (timercmp(&victim->timestamp_began, &cutoff, >)) if (timercmp(&victim->timestamp_began, &cutoff, >))
continue; /* it's still young, leave it alone */ continue; /* it's still young, leave it alone */
if (!any_opened_circs) { /* We need to double-check the opened state here because
* we don't want to consider opened 1-hop dircon circuits for
* deciding when to relax the timeout, but we *do* want to relax
* those circuits too if nothing else is opened *and* they still
* aren't either. */
if (!any_opened_circs && victim->state != CIRCUIT_STATE_OPEN) {
/* It's still young enough that we wouldn't close it, right? */ /* It's still young enough that we wouldn't close it, right? */
if (timercmp(&victim->timestamp_began, &close_cutoff, >)) { if (timercmp(&victim->timestamp_began, &close_cutoff, >)) {
if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) { if (!TO_ORIGIN_CIRCUIT(victim)->relaxed_timeout) {