diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirserv.c | 9 | ||||
| -rw-r--r-- | src/or/routerparse.c | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f2946f9082..e96adc0a71 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -807,6 +807,10 @@ static int dirserv_regenerate_directory(void) tor_free(new_directory); the_directory_is_dirty = 0; + /* Save the directory to disk so we re-load it quickly on startup. + */ + dirserv_set_cached_directory(the_directory, time(NULL), 0); + return 0; } @@ -891,6 +895,11 @@ static int generate_runningrouters(crypto_pk_env_t *private_key) return -1; } runningrouters_is_dirty = 0; + + /* We don't cache runnning-routers to disk, so there's no point in + * authdirservers caching it. */ + /* dirserv_set_cached_directory(the_runningrouters, time(NULL), 1); */ + return 0; err: tor_free(s); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 5c2cd28f82..ca7d6ed5d3 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -389,7 +389,8 @@ router_parse_routerlist_from_directory(const char *str, /* Now that we know the signature is okay, and we have a * publication time, cache the directory. */ - dirserv_set_cached_directory(str, published_on, 0); + if (!get_options()->AuthoritativeDir) + dirserv_set_cached_directory(str, published_on, 0); if (!(tok = find_first_by_keyword(tokens, K_RECOMMENDED_SOFTWARE))) { log_fn(LOG_WARN, "Missing recommended-software line from directory."); @@ -515,7 +516,8 @@ router_parse_runningrouters(const char *str) /* Now that we know the signature is okay, and we have a * publication time, cache the list. */ - dirserv_set_cached_directory(str, published_on, 1); + if (!get_options()->AuthoritativeDir) + dirserv_set_cached_directory(str, published_on, 1); if (!(tok = find_first_by_keyword(tokens, K_ROUTER_STATUS))) { if (!(tok = find_first_by_keyword(tokens, K_RUNNING_ROUTERS))) { |