[or-cvs] r12169: We want to extend the valid_until for "reasonably live", not (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-24 22:12:16 -0400 (Wed, 24 Oct 2007)
New Revision: 12169

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r16124 at catbus:  nickm | 2007-10-24 22:11:09 -0400
 We want to extend the valid_until for "reasonably live", not the valid_after time



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16124] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-25 02:08:58 UTC (rev 12168)
+++ tor/trunk/src/or/networkstatus.c	2007-10-25 02:12:16 UTC (rev 12169)
@@ -1128,8 +1128,8 @@
 {
 #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;