From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Oct 2007 02:12:16 +0000 (+0000)
Subject:  r16124@catbus:  nickm | 2007-10-24 22:11:09 -0400
X-Git-Tag: tor-0.2.0.9-alpha~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beb73c90abd9d6a3266b02abaff61dce8b891d61;p=thirdparty%2Ftor.git

 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
---

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;