Remaining 008pre1 items done; deferred where more design is needed.

More docs and (way more!) testing needed.

Done:
 - Authdirservers down directories from others.
 - Generate and use running-routers lists
 - Cache directories; store across reboots.
 - Refactor directory parsing a bit; note potential trouble spots.


svn:r1985

1 files changed, 4 insertions, 2 deletions

diff --git a/src/or/router.c b/src/or/router.c
index dd6dd452c2..9d386bbad4 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -284,12 +284,14 @@ int init_keys(void) {
   if(!cp) {
     log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir);
   } else {
-    if(dirserv_init_from_directory_string(cp) < 0) {
+    if(options.AuthoritativeDir && dirserv_load_from_directory_string(cp) < 0){
       log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir);
       free(cp);
       return -1;
     }
-    free(cp);
+    /* set time to 1 so it will be replaced on first download.
+     */
+    dirserv_set_cached_directory(cp, 1);
   }
   /* success */
   return 0;