diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-07-25 00:52:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-07-25 00:52:54 -0400 |
| commit | 2b0e8fb39f0ac9c0bfadc64102440843300fa9d7 (patch) | |
| tree | 226d63182870fb9ada2a7080c88d6a1b1adc6b19 /src/or | |
| parent | 698ec8d7b97b048cdee1ba72fda0e08292cb1a7e (diff) | |
| parent | e7576f92dec47ffb48f481b7a92b3fc0c76105eb (diff) | |
| download | tor-2b0e8fb39f0ac9c0bfadc64102440843300fa9d7.tar.gz tor-2b0e8fb39f0ac9c0bfadc64102440843300fa9d7.zip | |
Merge commit 'ioerror/DirFetchInfoExtraEarly'
Conflicts:
ChangeLog
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 5 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 9 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 46d147090b..4590c4eab7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -215,6 +215,7 @@ static config_var_t _option_vars[] = { V(FirewallPorts, CSV, ""), V(FastFirstHopPK, BOOL, "1"), V(FetchDirInfoEarly, BOOL, "0"), + V(FetchDirInfoExtraEarly, BOOL, "0"), V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"), @@ -3195,6 +3196,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("HSAuthorityRecordStats is set but we're not running as " "a hidden service authority."); + if (options->FetchDirInfoExtraEarly && !options->FetchDirInfoEarly) + REJECT("FetchDirInfoExtraEarly requires that you also set " + "FetchDirInfoEarly"); + if (options->ConnLimit <= 0) { r = tor_snprintf(buf, sizeof(buf), "ConnLimit must be greater than 0, but was set to %d", diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e78aefc5fa..97353c01da 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1133,8 +1133,13 @@ update_consensus_networkstatus_fetch_time(time_t now) /* We want to cache the next one at some point after this one * is no longer fresh... */ start = c->fresh_until + CONSENSUS_MIN_SECONDS_BEFORE_CACHING; - /* But only in the first half-interval after that. */ - dl_interval = interval/2; + /* Some clients may need the consensus sooner than others. */ + if (options->FetchDirInfoExtraEarly) { + dl_interval = 60; + } else { + /* But only in the first half-interval after that. */ + dl_interval = interval/2; + } } else { /* We're an ordinary client or a bridge. Give all the caches enough * time to download the consensus. */ diff --git a/src/or/or.h b/src/or/or.h index 445df4d78e..be72750a7b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2452,6 +2452,9 @@ typedef struct { * means directly from the authorities) no matter our other config? */ int FetchDirInfoEarly; + /** Should we fetch our dir info at the start of the consensus period? */ + int FetchDirInfoExtraEarly; + char *VirtualAddrNetwork; /**< Address and mask to hand out for virtual * MAPADDRESS requests. */ int ServerDNSSearchDomains; /**< Boolean: If set, we don't force exit |