diff options
author | Nick Mathewson <nickm@torproject.org> | 2005-09-07 16:42:53 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2005-09-07 16:42:53 +0000 |
commit | 5c6c88e76d65c4817cd44048ad5803a4b0c1cb9e (patch) | |
tree | 1455921cbbfa0d2f52577a93cd7565ace01d9434 /src/or/main.c | |
parent | f7256b700766ba7195e8c34c07fcd966201eb71f (diff) | |
download | tor-5c6c88e76d65c4817cd44048ad5803a4b0c1cb9e.tar tor-5c6c88e76d65c4817cd44048ad5803a4b0c1cb9e.tar.gz |
More stuff for new directories.
- Distinguish v1 authorities (all currently trusted directories) from
v2 authorities (all trusted directories).
- Add configuration option for which dirs are v1 authories.
- Add configuration option for whether to be a v1 authority.
- Make trusted dirserver selection functions take options to
choose which functionality we need.
- Remove option when getting directory cache to see whether they
support running-routers; they all do now. Replace it with one
to see whether caches support v2 stuff.
- Parse, cache, and serve network-status objects properly.
- Serve compressed groups of router descriptors. The compression logic
here could be more memory-efficient.
-
svn:r4911
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 2aa2dc119..8f0f32984 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -711,7 +711,7 @@ run_scheduled_events(time_t now) } if (time_to_fetch_running_routers < now) { - if (!authdir_mode(options)) { + if (!authdir_mode(options) || !options->V1AuthoritativeDir) { directory_get_from_dirserver(DIR_PURPOSE_FETCH_RUNNING_LIST, NULL, 1); } time_to_fetch_running_routers = now + get_status_fetch_period(options); @@ -972,6 +972,9 @@ do_main_loop(void) if (router_reload_router_list()) { return -1; } + if (router_reload_networkstatus()) { + return -1; + } if (authdir_mode(get_options())) { /* the directory is already here, run startup things */ |