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 332e7b0ad2170623525c9efb169394b30c8e6b43..e3899b75fa1684acc1d129d3cf9a75a6f9eda90c 100644 (file)
--- 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;