[or-cvs] fix yet another time comparison bug. we were abandoning hel...

[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:
	circuitbuild.c 
Log Message:
fix yet another time comparison bug. we were abandoning helpers
as soon as they became unavailable. (is this true?)


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- circuitbuild.c	11 Dec 2005 11:20:26 -0000	1.176
+++ circuitbuild.c	11 Dec 2005 11:23:36 -0000	1.177
@@ -1751,10 +1751,12 @@
     helper_node_t *helper = smartlist_get(helper_nodes, i);
     const char *why = NULL;
     time_t since = 0;
-    if (helper->unlisted_since + HELPER_ALLOW_UNLISTED > now) {
+    if (helper->unlisted_since &&
+        helper->unlisted_since + HELPER_ALLOW_UNLISTED < now) {
       why = "unlisted";
       since = helper->unlisted_since;
-    } else if (helper->down_since + HELPER_ALLOW_DOWNTIME > now) {
+    } else if (helper->down_since &&
+               helper->down_since + HELPER_ALLOW_DOWNTIME < now) {
       why = "down";
       since = helper->down_since;
     }