[or-cvs] r13636: Recover from bad tracked-since value in mtbf history file. T (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-20 21:18:41 -0500 (Wed, 20 Feb 2008)
New Revision: 13636

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/rephist.c
Log:
 r18288 at catbus:  nickm | 2008-02-20 21:18:38 -0500
 Recover from bad tracked-since value in mtbf history file.  This may finally close bug 537.



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

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-02-21 02:10:38 UTC (rev 13635)
+++ tor/trunk/ChangeLog	2008-02-21 02:18:41 UTC (rev 13636)
@@ -59,6 +59,8 @@
       directory request. Now compare correctly. Noticed by Veracode.
     - When starting as an authority, do not overwrite all certificates
       cached from other authorities.  Bugfix on 0.2.0.x.  Fixes bug 606.
+    - Recover from bad tracked-since value in MTBF-history file.
+      Should fix bug 537.
 
   o Code simplifications and refactoring:
     - Remove the tor_strpartition function: its logic was confused,

Modified: tor/trunk/src/or/rephist.c
===================================================================
--- tor/trunk/src/or/rephist.c	2008-02-21 02:10:38 UTC (rev 13635)
+++ tor/trunk/src/or/rephist.c	2008-02-21 02:18:41 UTC (rev 13636)
@@ -954,7 +954,7 @@
   if (strcmp(line, "."))
     log_warn(LD_GENERAL, "Truncated MTBF file.");
 
-  if (!tracked_since)
+  if (tracked_since < 86400*365) /* Recover from insanely early value. */
     tracked_since = latest_possible_start;
 
   stability_last_downrated = last_downrated;