nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor authority_certs_fetch_missing to call get_options once

Browse Source
This commit is contained in:
teor (Tim Wilson-Brown) 2016-07-01 09:35:27 +10:00
parent 64ee7bcd0c
commit 596ccbf839
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/routerlist.c
View File

@ -865,12 +865,13 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
smartlist_t *missing_cert_digests, *missing_id_digests; smartlist_t *missing_cert_digests, *missing_id_digests;
char *resource = NULL; char *resource = NULL;
cert_list_t *cl; cert_list_t *cl;
const int cache = directory_caches_unknown_auth_certs(get_options()); const or_options_t *options = get_options();
const int cache = directory_caches_unknown_auth_certs(options);
fp_pair_t *fp_tmp = NULL; fp_pair_t *fp_tmp = NULL;
char id_digest_str[2*DIGEST_LEN+1]; char id_digest_str[2*DIGEST_LEN+1];
char sk_digest_str[2*DIGEST_LEN+1]; char sk_digest_str[2*DIGEST_LEN+1];
if (should_delay_dir_fetches(get_options(), NULL)) if (should_delay_dir_fetches(options, NULL))
return; return;
pending_cert = fp_pair_map_new(); pending_cert = fp_pair_map_new();
@ -911,7 +912,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
} SMARTLIST_FOREACH_END(cert); } SMARTLIST_FOREACH_END(cert);
if (!found && if (!found &&
download_status_is_ready(&(cl->dl_status_by_id), now, download_status_is_ready(&(cl->dl_status_by_id), now,
get_options()->TestingCertMaxDownloadTries) && options->TestingCertMaxDownloadTries) &&
!digestmap_get(pending_id, ds->v3_identity_digest)) { !digestmap_get(pending_id, ds->v3_identity_digest)) {
log_info(LD_DIR, log_info(LD_DIR,
"No current certificate known for authority %s " "No current certificate known for authority %s "
@ -973,7 +974,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
} }
if (download_status_is_ready_by_sk_in_cl( if (download_status_is_ready_by_sk_in_cl(
cl, sig->signing_key_digest, cl, sig->signing_key_digest,
now, get_options()->TestingCertMaxDownloadTries) && now, options->TestingCertMaxDownloadTries) &&
!fp_pair_map_get_by_digests(pending_cert, !fp_pair_map_get_by_digests(pending_cert,
voter->identity_digest, voter->identity_digest,
sig->signing_key_digest)) { sig->signing_key_digest)) {
@ -1075,7 +1076,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
* directory */ * directory */
if (rs) { if (rs) {
/* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */ /* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */
int get_via_tor = get_options()->AllDirActionsPrivate; int get_via_tor = options->AllDirActionsPrivate;
const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS
: DIRIND_ONEHOP; : DIRIND_ONEHOP;
directory_initiate_command_routerstatus(rs, directory_initiate_command_routerstatus(rs,
@ -1136,7 +1137,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now,
* directory */ * directory */
if (rs) { if (rs) {
/* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */ /* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */
int get_via_tor = get_options()->AllDirActionsPrivate; int get_via_tor = options->AllDirActionsPrivate;
const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS
: DIRIND_ONEHOP; : DIRIND_ONEHOP;
directory_initiate_command_routerstatus(rs, directory_initiate_command_routerstatus(rs,