]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Early exit from circuit_build_times_set_timeout() if adaptive timeouts are disabled
authorAndrea Shepard <andrea@persephoneslair.org>
Tue, 12 Jun 2012 19:24:05 +0000 (12:24 -0700)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Jun 2012 20:45:13 +0000 (16:45 -0400)
src/or/circuitbuild.c

index 8efaa7cf4d63e7a02454fa5fd577c00050a115f8..03b702bed99520f9f55528f4cc1a7566cfd23856 100644 (file)
@@ -1598,6 +1598,12 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
   long prev_timeout = tor_lround(cbt->timeout_ms/1000);
   double timeout_rate;
 
+  /*
+   * Just return if we aren't using adaptive timeouts
+   */
+  if (circuit_build_times_disabled())
+    return;
+
   if (!circuit_build_times_set_timeout_worker(cbt))
     return;