Be willing to cache directories from up to ROUTER_MAX_AGE seconds into the future...

svn:r3832

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 5f6b314bbc5a6132b765413ff43e624e1c9cc398..12641c714b539c405623a98a014ba63e2f80ab2a 100644 (file)
--- 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);