diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-17 11:55:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-17 11:55:58 -0400 |
| commit | fc66a2ad1bf1e653cae47eb54fc6324d29d5916e (patch) | |
| tree | 40113450bc058d171494c21734c2268a460c2ddf | |
| parent | e7d2a9b6c4407217780be3a0d0cbb29fd3812cf5 (diff) | |
| parent | 6f58481335ac4ce9a1bbeb35218aee3c2274744d (diff) | |
| download | tor-fc66a2ad1bf1e653cae47eb54fc6324d29d5916e.tar tor-fc66a2ad1bf1e653cae47eb54fc6324d29d5916e.tar.gz | |
Merge branch 'bug1141_v3' into maint-0.2.1
| -rw-r--r-- | changes/bug1141 | 5 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 17 |
2 files changed, 18 insertions, 4 deletions
diff --git a/changes/bug1141 b/changes/bug1141 new file mode 100644 index 000000000..9975e418d --- /dev/null +++ b/changes/bug1141 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an assertion failure that could occur in caches or bridge users + when using a very short voting interval on a testing network. + Diagnosed by Robert Hogan. Fixes bug 1141; bugfix on 0.2.0.8-alpha. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index a43ed5254..4721420bb 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1132,11 +1132,21 @@ update_consensus_networkstatus_fetch_time(time_t now) if (c) { long dl_interval; long interval = c->fresh_until - c->valid_after; + long min_sec_before_caching = CONSENSUS_MIN_SECONDS_BEFORE_CACHING; time_t start; + + if (min_sec_before_caching > interval/16) { + /* Usually we allow 2-minutes slop factor in case clocks get + desynchronized a little. If we're on a private network with + a crazy-fast voting interval, though, 2 minutes may be too + much. */ + min_sec_before_caching = interval/16; + } + if (directory_fetches_dir_info_early(options)) { /* 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; + start = c->fresh_until + min_sec_before_caching; /* But only in the first half-interval after that. */ dl_interval = interval/2; } else { @@ -1150,10 +1160,9 @@ update_consensus_networkstatus_fetch_time(time_t now) * to choose the rest of the interval *after* them. */ if (directory_fetches_dir_info_later(options)) { /* Give all the *clients* enough time to download the consensus. */ - start = start + dl_interval + CONSENSUS_MIN_SECONDS_BEFORE_CACHING; + start = start + dl_interval + min_sec_before_caching; /* But try to get it before ours actually expires. */ - dl_interval = (c->valid_until - start) - - CONSENSUS_MIN_SECONDS_BEFORE_CACHING; + dl_interval = (c->valid_until - start) - min_sec_before_caching; } } if (dl_interval < 1) |