[or-cvs] don"t check for reachability, and don"t whine about it, whi...

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	main.c 
Log Message:
don't check for reachability, and don't whine about it, while we're
hibernating.


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -d -r1.477 -r1.478
--- main.c	27 Mar 2005 11:52:15 -0000	1.477
+++ main.c	29 Mar 2005 03:48:31 -0000	1.478
@@ -714,7 +714,8 @@
     /* also, check religiously for reachability, if it's within the first
      * 20 minutes of our uptime. */
     if (server_mode(options) &&
-        stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT)
+        stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
+        !we_are_hibernating())
       consider_testing_reachability();
   }
 
@@ -811,6 +812,7 @@
   stats_prev_global_write_bucket = global_write_bucket;
 
   if (server_mode(options) &&
+      !we_are_hibernating() &&
       !check_whether_ports_reachable() &&
       stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
       (stats_n_seconds_working+seconds_elapsed) /