[or-cvs] r8415: good god, that was a bad idea. i've built 500 circuits in th (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2006-09-18 00:59:15 -0400 (Mon, 18 Sep 2006)
New Revision: 8415

Modified:
   tor/trunk/src/or/circuituse.c
Log:
good god, that was a bad idea. i've built 500 circuits in the past 5
minutes, trying to establish reachability of my unreachable server.


Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2006-09-18 04:32:08 UTC (rev 8414)
+++ tor/trunk/src/or/circuituse.c	2006-09-18 04:59:15 UTC (rev 8415)
@@ -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. Considering launching another one.");
+           "has failed. I'll try again later.");
 
-  if (!circuit_enough_testing_circs())
-    consider_testing_reachability(1, 0);
-
   /* These aren't used yet. */
   (void)circ;
   (void)at_last_hop;