From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Mar 2005 06:39:53 +0000 (+0000)
Subject: Be willing to cache directories from up to ROUTER_MAX_AGE seconds into the future... 
X-Git-Tag: tor-0.1.0.1-rc~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7a9e2e7b436d45c86fc4122c184f8235799d3c;p=thirdparty%2Ftor.git

Be willing to cache directories from up to ROUTER_MAX_AGE seconds into the future, now that we are more tolerant of skew.


svn:r3832
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 5f6b314bbc..12641c714b 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -751,10 +751,10 @@ void dirserv_set_cached_directory(const char *directory, time_t when,
   d = is_running_routers ? &cached_runningrouters : &cached_directory;
   if (when<=d->published) {
     log_fn(LOG_INFO, "Ignoring old directory; not caching.");
-  } else if (when>=now+ROUTER_ALLOW_SKEW) {
+  } else if (when>=now+ROUTER_MAX_AGE) {
     log_fn(LOG_INFO, "Ignoring future directory; not caching.");
-  } else if (when>d->published &&
-        when<now+ROUTER_ALLOW_SKEW) {
+  } else {
+    /* if (when>d->published && when<now+ROUTER_MAX_AGE) */
     log_fn(LOG_DEBUG, "Caching directory.");
     tor_free(d->dir);
     d->dir = tor_strdup(directory);