summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-03-23 06:39:53 +0000
committerNick Mathewson <nickm@torproject.org>2005-03-23 06:39:53 +0000
commit0b7a9e2e7b436d45c86fc4122c184f8235799d3c (patch)
treeaca88b341fb923bf49a718c5742a70ad466f09e6 /src/or
parent631ab5c69b49f84ca191ff546f4795040e561843 (diff)
downloadtor-0b7a9e2e7b436d45c86fc4122c184f8235799d3c.tar.gz
tor-0b7a9e2e7b436d45c86fc4122c184f8235799d3c.zip
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
Diffstat (limited to 'src/or')
-rw-r--r--src/or/dirserv.c6
1 files changed, 3 insertions, 3 deletions
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);