summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-18 10:53:39 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-22 15:55:09 -0400
commit9aaed729c188a1f560d025388374c7dc1135478e (patch)
treec2332a207d39850e9e354ffc3662672bb6f831d9 /src/or/directory.c
parentd8ac7d557c0af199d21639a52a8c8c9dd201f555 (diff)
downloadtor-9aaed729c188a1f560d025388374c7dc1135478e.tar.gz
tor-9aaed729c188a1f560d025388374c7dc1135478e.zip
Rename *DownloadSchedule to *DownloadInitialDelay; make them ints
This commit won't compile. It was made with the following perl scripts: s/smartlist_t \*(.*)DownloadSchedule;/int $1DownloadInitialDelay;/; s/\b(\w*)DownloadSchedule\b/$1DownloadInitialDelay/;
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index c419b61d02..3e4d978eed 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -5311,14 +5311,14 @@ find_dl_schedule(const download_status_t *dls, const or_options_t *options)
/* Any other directory document */
if (dir_server_mode(options)) {
/* A directory authority or directory mirror */
- return options->TestingServerDownloadSchedule;
+ return options->TestingServerDownloadInitialDelay;
} else {
- return options->TestingClientDownloadSchedule;
+ return options->TestingClientDownloadInitialDelay;
}
case DL_SCHED_CONSENSUS:
if (!networkstatus_consensus_can_use_multiple_directories(options)) {
/* A public relay */
- return options->TestingServerConsensusDownloadSchedule;
+ return options->TestingServerConsensusDownloadInitialDelay;
} else {
/* A client or bridge */
if (networkstatus_consensus_is_bootstrapping(time(NULL))) {
@@ -5326,33 +5326,33 @@ find_dl_schedule(const download_status_t *dls, const or_options_t *options)
if (!networkstatus_consensus_can_use_extra_fallbacks(options)) {
/* A bootstrapping client without extra fallback directories */
return
- options->ClientBootstrapConsensusAuthorityOnlyDownloadSchedule;
+ options->ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay;
} else if (dls->want_authority) {
/* A bootstrapping client with extra fallback directories, but
* connecting to an authority */
return
- options->ClientBootstrapConsensusAuthorityDownloadSchedule;
+ options->ClientBootstrapConsensusAuthorityDownloadInitialDelay;
} else {
/* A bootstrapping client connecting to extra fallback directories
*/
return
- options->ClientBootstrapConsensusFallbackDownloadSchedule;
+ options->ClientBootstrapConsensusFallbackDownloadInitialDelay;
}
} else {
/* A client with a reasonably live consensus, with or without
* certificates */
- return options->TestingClientConsensusDownloadSchedule;
+ return options->TestingClientConsensusDownloadInitialDelay;
}
}
case DL_SCHED_BRIDGE:
if (options->UseBridges && num_bridges_usable(0) > 0) {
/* A bridge client that is sure that one or more of its bridges are
* running can afford to wait longer to update bridge descriptors. */
- return options->TestingBridgeDownloadSchedule;
+ return options->TestingBridgeDownloadInitialDelay;
} else {
/* A bridge client which might have no running bridges, must try to
* get bridge descriptors straight away. */
- return options->TestingBridgeBootstrapDownloadSchedule;
+ return options->TestingBridgeBootstrapDownloadInitialDelay;
}
default:
tor_assert(0);