mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug7799_rebased' into maint-0.2.4

Browse source
This commit is contained in:
Nick Mathewson 2013-03-29 12:17:35 -04:00
commit 33f86faa5a
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changes/bug7799 Normal file
View file

@ -0,0 +1,7 @@
o Minor changes (log clarification)
- Add more detail to a log message about relaxed timeouts. Hopefully
this additional detail will allow us to diagnose the cause of bug 7799.
o Minor bugfixes
- Don't attempt to relax the timeout of already opened 1-hop circuits.
They might never timeout. This should eliminate some/all cases of
the relaxed timeout log message.

28
src/or/circuituse.c
View file

@ -529,15 +529,25 @@ 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) {
int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state
== CPATH_STATE_OPEN; == CPATH_STATE_OPEN;
log_info(LD_CIRC, log_info(LD_CIRC,
"No circuits are opened. Relaxing timeout for " "No circuits are opened. Relaxing timeout for circuit %d "
"a circuit with channel state %s. %d guards are live.", "(a %s %d-hop circuit in state %s with channel state %s). "
"%d guards are live.",
TO_ORIGIN_CIRCUIT(victim)->global_identifier,
circuit_purpose_to_string(victim->purpose),
TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len,
circuit_state_to_string(victim->state),
channel_state_to_string(victim->n_chan->state), channel_state_to_string(victim->n_chan->state),
num_live_entry_guards(0)); num_live_entry_guards(0));
@ -552,10 +562,14 @@ circuit_expire_building(void)
} else { } else {
static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); static ratelim_t relax_timeout_limit = RATELIM_INIT(3600);
log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC,
"No circuits are opened. Relaxed timeout for " "No circuits are opened. Relaxed timeout for circuit %d "
"a circuit with channel state %s to %ldms. " "(a %s %d-hop circuit in state %s with channel state %s) to "
"However, it appears the circuit has timed out anyway. " "%ldms. However, it appears the circuit has timed out "
"%d guards are live.", "anyway. %d guards are live.",
TO_ORIGIN_CIRCUIT(victim)->global_identifier,
circuit_purpose_to_string(victim->purpose),
TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len,
circuit_state_to_string(victim->state),
channel_state_to_string(victim->n_chan->state), channel_state_to_string(victim->n_chan->state),
(long)circ_times.close_ms, num_live_entry_guards(0)); (long)circ_times.close_ms, num_live_entry_guards(0));
} }