summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-10-25 02:12:16 +0000
committerNick Mathewson <nickm@torproject.org>2007-10-25 02:12:16 +0000
commitbeb73c90abd9d6a3266b02abaff61dce8b891d61 (patch)
treee5757f31f71e85ec7107745996e7b6ffa5a34cb9
parent93331ebf692eb77bf141d8e288eb701cdd5f332c (diff)
downloadtor-beb73c90abd9d6a3266b02abaff61dce8b891d61.tar.gz
tor-beb73c90abd9d6a3266b02abaff61dce8b891d61.zip
r16124@catbus: nickm | 2007-10-24 22:11:09 -0400
We want to extend the valid_until for "reasonably live", not the valid_after time svn:r12169
-rw-r--r--src/or/networkstatus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 332e7b0ad2..e3899b75fa 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1128,8 +1128,8 @@ networkstatus_get_reasonably_live_consensus(time_t now)
{
#define REASONABLY_LIVE_TIME (24*60*60)
if (current_consensus &&
- current_consensus->valid_after <= now+REASONABLY_LIVE_TIME &&
- now <= current_consensus->valid_until)
+ current_consensus->valid_after <= now &&
+ now <= current_consensus->valid_until+REASONABLY_LIVE_TIME)
return current_consensus;
else
return NULL;