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

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
Nick Mathewson 2019-02-19 11:27:21 -05:00
commit 8a5c66cbb0
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug28698 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfix (logging):
- Avoid logging about relaxing circuits when their time is fixed.
Fixes bug 28698; bugfix on 0.2.4.7-alpha

30
src/core/or/circuituse.c
View File

@ -546,6 +546,8 @@ circuit_expire_building(void)
SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *,victim) { SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *,victim) {
struct timeval cutoff; struct timeval cutoff;
bool fixed_time = circuit_build_times_disabled(get_options());
if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */ if (!CIRCUIT_IS_ORIGIN(victim) || /* didn't originate here */
victim->marked_for_close) /* don't mess with marked circs */ victim->marked_for_close) /* don't mess with marked circs */
continue; continue;
@ -600,17 +602,19 @@ circuit_expire_building(void)
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, if (!fixed_time) {
"No circuits are opened. Relaxing timeout for circuit %d " log_info(LD_CIRC,
"(a %s %d-hop circuit in state %s with channel state %s).", "No circuits are opened. Relaxing timeout for circuit %d "
TO_ORIGIN_CIRCUIT(victim)->global_identifier, "(a %s %d-hop circuit in state %s with channel state %s).",
circuit_purpose_to_string(victim->purpose), TO_ORIGIN_CIRCUIT(victim)->global_identifier,
TO_ORIGIN_CIRCUIT(victim)->build_state ? circuit_purpose_to_string(victim->purpose),
TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len : TO_ORIGIN_CIRCUIT(victim)->build_state ?
-1, TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len :
circuit_state_to_string(victim->state), -1,
victim->n_chan ? circuit_state_to_string(victim->state),
channel_state_to_string(victim->n_chan->state) : "none"); victim->n_chan ?
channel_state_to_string(victim->n_chan->state) : "none");
}
/* We count the timeout here for CBT, because technically this /* We count the timeout here for CBT, because technically this
* was a timeout, and the timeout value needs to reset if we * was a timeout, and the timeout value needs to reset if we
@ -624,7 +628,8 @@ circuit_expire_building(void)
} else { } else {
static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); static ratelim_t relax_timeout_limit = RATELIM_INIT(3600);
const double build_close_ms = get_circuit_build_close_time_ms(); const double build_close_ms = get_circuit_build_close_time_ms();
log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, if (!fixed_time) {
log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC,
"No circuits are opened. Relaxed timeout for circuit %d " "No circuits are opened. Relaxed timeout for circuit %d "
"(a %s %d-hop circuit in state %s with channel state %s) to " "(a %s %d-hop circuit in state %s with channel state %s) to "
"%ldms. However, it appears the circuit has timed out " "%ldms. However, it appears the circuit has timed out "
@ -638,6 +643,7 @@ circuit_expire_building(void)
victim->n_chan ? victim->n_chan ?
channel_state_to_string(victim->n_chan->state) : "none", channel_state_to_string(victim->n_chan->state) : "none",
(long)build_close_ms); (long)build_close_ms);
}
} }
} }