From 9325b9269cbfce462c831d356059c1932e09f3d3 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 1 Oct 2009 04:15:45 -0400 Subject: [PATCH] Ignore one-hop circuits for circuit timeout calc Don't count one-hop circuits when we're estimating how long it takes circuits to build on average. Otherwise we'll set our circuit build timeout lower than we should. Bugfix on 0.2.2.2-alpha. --- ChangeLog | 4 ++++ src/or/circuitbuild.c | 37 ++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79a411ec34..d0d354c60f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,10 @@ Changes in version 0.2.2.4-alpha - 2009-??-?? circuit_build_times_parse_state. Bugfix on 0.2.2.2-alpha. - Make it explicit that we can't overflow in connection_ap_handshake_send_resolve. Bugfix on 0.0.7.1-1. + - Don't count one-hop circuits when we're estimating how long it + takes circuits to build on average. Otherwise we'll set our circuit + build timeout lower than we should. Bugfix on 0.2.2.2-alpha. + Changes in version 0.2.2.3-alpha - 2009-09-23 o Major bugfixes: diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 2e3465d6fe..1bf16e8b49 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -204,21 +204,18 @@ circuit_build_times_rewind_history(circuit_build_times_t *cbt, int n) } /** - * Add a timeoutout value to the set of build times. Time units - * are milliseconds + * Add a new timeout value time to the set of build times. Time + * units are milliseconds. * - * circuit_build_times is a circular array, so loop around when + * circuit_build_times cbt is a circular array, so loop around when * array is full. */ int circuit_build_times_add_time(circuit_build_times_t *cbt, build_time_t time) { - if (time > BUILD_TIME_MAX) { - log_notice(LD_CIRC, - "Circuit build time of %ums exceeds max. Capping at 65536ms", time); - time = BUILD_TIME_MAX; - } else if (time <= 0) { - log_err(LD_CIRC, "Circuit build time is %u!", time); + tor_assert(time <= BUILD_TIME_MAX); + if (time <= 0) { + log_warn(LD_CIRC, "Circuit build time is %u!", time); return -1; } @@ -627,10 +624,10 @@ circuit_build_times_add_timeout_worker(circuit_build_times_t *cbt, "%ums vs %lfms using Xm: %d a: %lf, q: %lf", gentime, cbt->timeout_ms, cbt->Xm, cbt->alpha, quantile_cutoff); } else if (gentime > BUILD_TIME_MAX) { - gentime = BUILD_TIME_MAX; log_info(LD_CIRC, "Generated a synthetic timeout larger than the max: %u", gentime); + gentime = BUILD_TIME_MAX; } else { log_info(LD_CIRC, "Generated synthetic circuit build time %u for timeout", gentime); @@ -1506,17 +1503,19 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) log_debug(LD_CIRC,"starting to send subsequent skin."); hop = onion_next_hop_in_cpath(circ->cpath); if (!hop) { - struct timeval end; - long timediff; - tor_gettimeofday(&end); - timediff = tv_mdiff(&circ->_base.highres_created, &end); - if (timediff > INT32_MAX) - timediff = INT32_MAX; /* done building the circuit. whew. */ circuit_set_state(TO_CIRCUIT(circ), CIRCUIT_STATE_OPEN); - circuit_build_times_add_time(&circ_times, (build_time_t)timediff); - circuit_build_times_network_circ_success(&circ_times); - circuit_build_times_set_timeout(&circ_times); + if (!circ->build_state->onehop_tunnel) { + struct timeval end; + long timediff; + tor_gettimeofday(&end); + timediff = tv_mdiff(&circ->_base.highres_created, &end); + if (timediff > BUILD_TIME_MAX) + timediff = BUILD_TIME_MAX; + circuit_build_times_add_time(&circ_times, (build_time_t)timediff); + circuit_build_times_network_circ_success(&circ_times); + circuit_build_times_set_timeout(&circ_times); + } log_info(LD_CIRC,"circuit built!"); circuit_reset_failure_count(0); if (circ->build_state->onehop_tunnel)