diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-16 07:57:37 -0500 |
| commit | 3c89622e39d964b731a40c6a705327d5caa07be4 (patch) | |
| tree | fd7e30579398838eea9a58eb48964c95f7298099 /src/feature/nodelist/routerlist.c | |
| parent | 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09 (diff) | |
| parent | efb301c86c288c01e21dfb5da9f685f33341b2c2 (diff) | |
| download | tor-3c89622e39d964b731a40c6a705327d5caa07be4.tar.gz tor-3c89622e39d964b731a40c6a705327d5caa07be4.zip | |
Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
Resolved conflicts in src/core/include.am
Diffstat (limited to 'src/feature/nodelist/routerlist.c')
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 390d6c9c01..42ce6f4c4e 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -73,6 +73,7 @@ #include "feature/dirauth/reachability.h" #include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" +#include "feature/dirclient/dirclient_modes.h" #include "feature/dirclient/dlstatus.h" #include "feature/dircommon/directory.h" #include "feature/nodelist/authcert.h" @@ -2404,7 +2405,7 @@ max_dl_per_request(const or_options_t *options, int purpose) } /* If we're going to tunnel our connections, we can ask for a lot more * in a request. */ - if (directory_must_use_begindir(options)) { + if (dirclient_must_use_begindir(options)) { max = 500; } return max; @@ -2447,7 +2448,7 @@ launch_descriptor_downloads(int purpose, if (!n_downloadable) return; - if (!directory_fetches_dir_info_early(options)) { + if (!dirclient_fetches_dir_info_early(options)) { if (n_downloadable >= MAX_DL_TO_DELAY) { log_debug(LD_DIR, "There are enough downloadable %ss to launch requests.", @@ -2538,7 +2539,7 @@ update_consensus_router_descriptor_downloads(time_t now, int is_vote, int n_delayed=0, n_have=0, n_would_reject=0, n_wouldnt_use=0, n_inprogress=0, n_in_oldrouters=0; - if (directory_too_idle_to_fetch_descriptors(options, now)) + if (dirclient_too_idle_to_fetch_descriptors(options, now)) goto done; if (!consensus) goto done; |