From: Roger Dingledine <arma@torproject.org>
Date: Wed, 6 Oct 2004 05:05:43 +0000 (+0000)
Subject: when an OR starts up, it loads its directory from cache.
X-Git-Tag: debian-version-0.0.8+0.0.9pre2-1~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b02610bd517a884e2077e1b5d14a5a4e71da0d0;p=thirdparty%2Ftor.git

when an OR starts up, it loads its directory from cache.
then it serves *that directory* to others who ask for a copy of the
directory. it's better to serve no directory at all until you have a
fresh copy.


svn:r2418
---

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f0756b3e0c..2c79c39075 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -794,11 +794,11 @@ int router_load_routerlist_from_string(const char *s, int trusted)
  * pkey; else check against the pkey of the signing directory server. */
 int router_load_routerlist_from_directory(const char *s,
                                           crypto_pk_env_t *pkey,
-                                          int check_version)
+                                          int dir_is_recent)
 {
   routerlist_t *new_list = NULL;
   if (router_parse_routerlist_from_directory(s, &new_list, pkey,
-                                             check_version)) {
+                                             dir_is_recent)) {
     log_fn(LOG_WARN, "Couldn't parse directory.");
     return -1;
   }
@@ -823,7 +823,8 @@ int router_load_routerlist_from_directory(const char *s,
     dirserv_load_from_directory_string(s);
   } else {
     /* Remember the directory. */
-    dirserv_set_cached_directory(s, routerlist->published_on);
+    if(dir_is_recent)
+      dirserv_set_cached_directory(s, routerlist->published_on);
   }
   return 0;
 }