[or-cvs] think harder about my logic

[arma at seul.org]

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

Modified Files:
	config.c main.c 
Log Message:
think harder about my logic


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -p -d -r1.575 -r1.576
--- config.c	22 Jul 2006 07:15:34 -0000	1.575
+++ config.c	22 Jul 2006 07:19:11 -0000	1.576
@@ -796,7 +796,7 @@ options_act(or_options_t *old_options)
           return -1;
         }
         server_has_changed_ip();
-        if (has_completed_circuit || any_predicted_circuits(time(NULL)))
+        if (has_completed_circuit || !any_predicted_circuits(time(NULL)))
           inform_testing_reachability();
       }
       cpuworkers_rotate();

Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -p -d -r1.655 -r1.656
--- main.c	22 Jul 2006 07:15:34 -0000	1.655
+++ main.c	22 Jul 2006 07:19:11 -0000	1.656
@@ -569,7 +569,7 @@ directory_info_has_arrived(time_t now, i
   }
 
   if (server_mode(options) && !we_are_hibernating() && !from_cache &&
-      (has_completed_circuit || any_predicted_circuits(now)))
+      (has_completed_circuit || !any_predicted_circuits(now)))
     consider_testing_reachability();
 }
 
@@ -833,7 +833,7 @@ run_scheduled_events(time_t now)
     /* also, check religiously for reachability, if it's within the first
      * 20 minutes of our uptime. */
     if (server_mode(options) &&
-        (has_completed_circuit || any_predicted_circuits(now)) &&
+        (has_completed_circuit || !any_predicted_circuits(now)) &&
         stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
         !we_are_hibernating())
       consider_testing_reachability();