diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-05-11 13:06:13 -0400 |
|---|---|---|
| committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-05-11 13:06:13 -0400 |
| commit | 2cbad2aac76d911cce7cee95e91aebc1b1fcb509 (patch) | |
| tree | cb933e1c74d8f8e6fe33ad71084cd865a154aaec | |
| parent | 28e1aa111803bc3548e00503ab56de5f3d41c7fc (diff) | |
| download | tor-2cbad2aac76d911cce7cee95e91aebc1b1fcb509.tar.gz tor-2cbad2aac76d911cce7cee95e91aebc1b1fcb509.zip | |
Revert "Switch between fallback and authority when auth cert fetch fails"
This reverts commit 92d7ee08b8c51b4b29f68c6d00ca4aa91ea5a66b.
| -rw-r--r-- | changes/bug18816 | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/changes/bug18816 b/changes/bug18816 index 05455120c0..7265f5ab3f 100644 --- a/changes/bug18816 +++ b/changes/bug18816 @@ -1,6 +1,4 @@ o Minor bugfix (bootstrap): - Consistently use the consensus download schedule for authority certificates. - - When downloading authority certificates fails, switch from - using a fallback to using an authority. Resolves ticket 18816; fix on fddb814fe in 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 31693437e1..85e9e7d834 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -912,14 +912,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fps) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fps, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -961,14 +958,11 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_END(d); if (smartlist_len(fp_pairs) > 1) { - static int want_auth = 0; resource = smartlist_join_strings(fp_pairs, "", 0, NULL); + /* XXX - do we want certs from authorities or mirrors? - teor */ directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, resource, PDS_RETRY_IF_NO_SERVERS, - want_auth ? DL_WANT_AUTHORITY - : DL_WANT_ANY_DIRSERVER); - /* on failure, swap between using fallbacks and authorities */ - want_auth = !want_auth; + DL_WANT_ANY_DIRSERVER); tor_free(resource); } /* else they were all pending */ |