nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate redundant hourly reset of descriptor download failures

Browse Source
This commit is contained in:
Andrea Shepard 2016-07-18 15:33:29 +00:00
parent 05853485a4
commit 09a0f2d0b2
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/main.c
View File

@ -169,9 +169,6 @@ static int can_complete_circuits = 0;
/** How often do we check for router descriptors that we should download /** How often do we check for router descriptors that we should download
* when we have enough directory info? */ * when we have enough directory info? */
#define LAZY_DESCRIPTOR_RETRY_INTERVAL (60) #define LAZY_DESCRIPTOR_RETRY_INTERVAL (60)
/** How often do we 'forgive' undownloadable router descriptors and attempt
* to download them again? */
#define DESCRIPTOR_FAILURE_RESET_INTERVAL (60*60)
/** Decides our behavior when no logs are configured/before any /** Decides our behavior when no logs are configured/before any
* logs have been configured. For 0, we log notice to stdout as normal. * logs have been configured. For 0, we log notice to stdout as normal.
@ -1247,7 +1244,6 @@ static int periodic_events_initialized = 0;
CALLBACK(rotate_onion_key); CALLBACK(rotate_onion_key);
CALLBACK(check_ed_keys); CALLBACK(check_ed_keys);
CALLBACK(launch_descriptor_fetches); CALLBACK(launch_descriptor_fetches);
CALLBACK(reset_descriptor_failures);
CALLBACK(rotate_x509_certificate); CALLBACK(rotate_x509_certificate);
CALLBACK(add_entropy); CALLBACK(add_entropy);
CALLBACK(launch_reachability_tests); CALLBACK(launch_reachability_tests);
@ -1279,7 +1275,6 @@ static periodic_event_item_t periodic_events[] = {
CALLBACK(rotate_onion_key), CALLBACK(rotate_onion_key),
CALLBACK(check_ed_keys), CALLBACK(check_ed_keys),
CALLBACK(launch_descriptor_fetches), CALLBACK(launch_descriptor_fetches),
CALLBACK(reset_descriptor_failures),
CALLBACK(rotate_x509_certificate), CALLBACK(rotate_x509_certificate),
CALLBACK(add_entropy), CALLBACK(add_entropy),
CALLBACK(launch_reachability_tests), CALLBACK(launch_reachability_tests),
@ -1605,15 +1600,6 @@ launch_descriptor_fetches_callback(time_t now, const or_options_t *options)
return GREEDY_DESCRIPTOR_RETRY_INTERVAL; return GREEDY_DESCRIPTOR_RETRY_INTERVAL;
} }
static int
reset_descriptor_failures_callback(time_t now, const or_options_t *options)
{
(void)now;
(void)options;
router_reset_descriptor_download_failures();
return DESCRIPTOR_FAILURE_RESET_INTERVAL;
}
static int static int
rotate_x509_certificate_callback(time_t now, const or_options_t *options) rotate_x509_certificate_callback(time_t now, const or_options_t *options)
{ {