[or-cvs] r8407: build testing circuits more rapidly. this has a failure mode (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-09-17 02:18:06 -0400 (Sun, 17 Sep 2006)
New Revision: 8407

Modified:
   tor/trunk/src/or/circuituse.c
Log:
build testing circuits more rapidly. this has a failure mode
where if circuits fail quickly, we'll fail a lot of them very
quickly and not retry for a while. so be it.


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2006-09-16 19:54:03 UTC (rev 8406)
+++ tor/trunk/src/or/circuituse.c	2006-09-17 06:18:06 UTC (rev 8407)
@@ -653,13 +653,13 @@
 static void
 circuit_testing_failed(origin_circuit_t *circ, int at_last_hop)
 {
-  if (server_mode(get_options()) && check_whether_orport_reachable())
-    return;
-
   log_info(LD_GENERAL,
            "Our testing circuit (to see if your ORPort is reachable) "
-           "has failed. I'll try again later.");
+           "has failed. Considering launching another one.");
 
+  if (!circuit_enough_testing_circs())
+    consider_testing_reachability(1, 0);
+
   /* These aren't used yet. */
   (void)circ;
   (void)at_last_hop;