mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 02:09:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'fristonio/ticket-24740'

Browse Source
This commit is contained in:
Nick Mathewson 2018-03-23 11:22:58 -04:00
commit e263317e07
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket24740 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (directory server cert fetch):
- Fixed launching a certificate fetch always during the scheduled
periodic consensus fetch by fetching only in those cases when
consensus are waiting for certs.
Fixes bug 24740; bugfix on 0.2.9.1-alpha.

17
src/or/networkstatus.c
View File

@ -951,9 +951,12 @@ update_consensus_networkstatus_downloads(time_t now)
continue;
}
/* Check if we're waiting for certificates to download */
if (check_consensus_waiting_for_certs(i, now, &consensus_dl_status[i]))
/** Check if we're waiting for certificates to download. If we are,
* launch download for missing directory authority certificates. */
if (check_consensus_waiting_for_certs(i, now, &consensus_dl_status[i])) {
update_certificate_downloads(now);
continue;
}
/* Try the requested attempt */
log_info(LD_DIR, "Launching %s standard networkstatus consensus "
@ -1230,16 +1233,20 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out)
return 0;
}
/** Launch requests for networkstatus documents and authority certificates as
* appropriate. */
/** Launch requests for networkstatus documents as appropriate. This is called
* when we retry all the connections on a SIGHUP and periodically by a Periodic
* event which checks whether we want to download any networkstatus documents.
*/
void
update_networkstatus_downloads(time_t now)
{
const or_options_t *options = get_options();
if (should_delay_dir_fetches(options, NULL))
return;
/** Launch a consensus download request, we will wait for the consensus to
* download and when it completes we will launch a certificate download
* request. */
update_consensus_networkstatus_downloads(now);
update_certificate_downloads(now);
}
/** Launch requests as appropriate for missing directory authority