From: Roger Dingledine <arma@torproject.org>
Date: Sun, 11 Dec 2005 11:23:36 +0000 (+0000)
Subject: fix yet another time comparison bug. we were abandoning helpers
X-Git-Tag: debian-version-0.1.1.10-alpha-1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c01fa3d5981ada2f664f65b8437b4cbeb4d202b;p=thirdparty%2Ftor.git

fix yet another time comparison bug. we were abandoning helpers
as soon as they became unavailable. (is this true?)


svn:r5565
---

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8ac40d9956..dc5a02d1ad 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1751,10 +1751,12 @@ remove_dead_helpers(void)
     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;
     }