[or-cvs] if your server hasn"t found itself to be reachable, complai...

[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:
if your server hasn't found itself to be reachable, complain every
20 minutes, not just once.


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -d -r1.475 -r1.476
--- main.c	27 Mar 2005 06:37:56 -0000	1.475
+++ main.c	27 Mar 2005 06:50:36 -0000	1.476
@@ -810,10 +810,11 @@
   stats_prev_global_write_bucket = global_write_bucket;
 
   if (server_mode(options) &&
-      stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
-      stats_n_seconds_working+seconds_elapsed >=
-        TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
-      !check_whether_ports_reachable()) {
+      !check_whether_ports_reachable() &&
+      stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
+      (stats_n_seconds_working+seconds_elapsed) /
+        TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
+    /* every 20 minutes, check and complain if necessary */
     routerinfo_t *me = router_get_my_routerinfo();
     log_fn(LOG_WARN,"Your server (%s:%d) has not managed to confirm that it is reachable. Please check your firewalls, ports, address, etc.",
            me ? me->address : options->Address, options->ORPort);