mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
Merge commit 'ioerror/DirFetchInfoExtraEarly'
Conflicts: ChangeLog
This commit is contained in:
commit
2b0e8fb39f
@ -32,6 +32,12 @@ Changes in version 0.2.2.1-alpha - 2009-07-2?
|
||||
- Time and memory units in the configuration file can now be set to
|
||||
fractional units. For example, "2.5 MB" is now a valid value for
|
||||
AccountingMax.
|
||||
- Certain Tor clients (such as those behind check.torproject.org) may
|
||||
want to fetch the consensus in an extra early manner. To enable this
|
||||
a user may now set FetchDirInfoExtraEarly to 1. This also depends on
|
||||
setting FetchDirInfoEarly to 1. Previous behavior will stay the same
|
||||
as only certain clients who must have this information sooner should
|
||||
set this option.
|
||||
|
||||
o Deprecated and removed features:
|
||||
- The controller no longer accepts the old obsolete "addr-mappings/"
|
||||
|
@ -241,6 +241,13 @@ fetching early. Normal users should leave it off.
|
||||
(Default: 0)
|
||||
.LP
|
||||
.TP
|
||||
\fBFetchDirInfoExtraEarly \fR\fB0\fR|\fB1\fR\fP
|
||||
If set to 1, Tor will fetch directory information before other
|
||||
directory caches. It will attempt to download directory information closer to
|
||||
the start of the consensus period. Normal users should leave it off.
|
||||
(Default: 0)
|
||||
.LP
|
||||
.TP
|
||||
\fBFetchHidServDescriptors \fR\fB0\fR|\fB1\fR\fP
|
||||
If set to 0, Tor will never fetch any hidden service descriptors from
|
||||
the rendezvous directories. This option is only useful if you're using
|
||||
|
@ -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",
|
||||
|
@ -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;
|
||||
/* 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. */
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user