diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-18 21:19:19 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-18 21:19:19 +0000 |
| commit | ec55cf526dc7707cca7588718ba1f99c1fe0a7f0 (patch) | |
| tree | 890940702217c6c11753950eefafbaf923bf04dc /src/or/main.c | |
| parent | a18770487227bce6e356f169aa86bdef70370c76 (diff) | |
| download | tor-ec55cf526dc7707cca7588718ba1f99c1fe0a7f0.tar.gz tor-ec55cf526dc7707cca7588718ba1f99c1fe0a7f0.zip | |
r12981@Kushana: nickm | 2007-05-18 14:12:19 -0400
First cut at code to download extra-info docs. Also note a bad bug in directory.c (look for the string BUG BUG BUG).
svn:r10209
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 41156faac1..4749df65dd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -668,6 +668,11 @@ directory_info_has_arrived(time_t now, int from_cache) "build a circuit."); update_router_descriptor_downloads(now); return; + } else { + /* Don't even bother trying to get extrainfo until the rest of our + * directory info is up-to-date */ + if (options->DownloadExtraInfo) + update_extrainfo_downloads(now); } if (server_mode(options) && !we_are_hibernating() && !from_cache && @@ -862,6 +867,7 @@ run_scheduled_events(time_t now) /* XXXX Maybe we should do this every 10sec when not enough info, * and every 60sec when we have enough info -NM */ update_router_descriptor_downloads(now); + update_extrainfo_downloads(now); time_to_try_getting_descriptors = now + DESCRIPTOR_RETRY_INTERVAL; } |