From: Roger Dingledine <arma@torproject.org>
Date: Wed, 29 Sep 2010 22:05:10 +0000 (-0400)
Subject: no measurement circs if not enough build times
X-Git-Tag: tor-0.2.2.17-alpha~9^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ceb3d4d578f4ebb8d0d1247adf895ccbab7f72db;p=thirdparty%2Ftor.git

no measurement circs if not enough build times

In the first 100 circuits, our timeout_ms and close_ms
are the same. So we shouldn't transition circuits to purpose
CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT, since they will just timeout again
next time we check.
---

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 66ee0c4353..18ef0c824b 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -384,7 +384,8 @@ circuit_expire_building(time_t now)
         continue;
       }
 
-      if (circuit_timeout_want_to_count_circ(TO_ORIGIN_CIRCUIT(victim))) {
+      if (circuit_timeout_want_to_count_circ(TO_ORIGIN_CIRCUIT(victim)) &&
+          circuit_build_times_enough_to_compute(&circ_times)) {
         /* Circuits are allowed to last longer for measurement.
          * Switch their purpose and wait. */
         if (victim->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) {