[or-cvs] r12133: Don't complain that "your server has not managed to confirm (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2007-10-23 11:44:13 -0400 (Tue, 23 Oct 2007)
New Revision: 12133

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/main.c
Log:
Don't complain that "your server has not managed to confirm that its
ports are reachable" if we haven't been able to build any circuits
yet. Bug found by spending four hours without a v3 consensus.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-10-23 08:19:25 UTC (rev 12132)
+++ tor/trunk/ChangeLog	2007-10-23 15:44:13 UTC (rev 12133)
@@ -106,6 +106,9 @@
     - Don't try to download extrainfo documents when we're trying to
       fetch enough directory info to build a circuit: having enough
       info should get priority.
+    - Don't complain that "your server has not managed to confirm that its
+      ports are reachable" if we haven't been able to build any circuits
+      yet. Bug found by spending four hours without a v3 consensus.
 
   o Minor bugfixes (performance):
     - Base64 decoding was actually showing up on our profile when parsing

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-10-23 08:19:25 UTC (rev 12132)
+++ tor/trunk/src/or/main.c	2007-10-23 15:44:13 UTC (rev 12133)
@@ -1153,6 +1153,7 @@
   if (server_mode(options) &&
       !we_are_hibernating() &&
       seconds_elapsed > 0 &&
+      has_completed_circuit &&
       stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
       (stats_n_seconds_working+seconds_elapsed) /
         TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {