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

Clean check for live consensus when updating the guard sample.

Browse Source 
The valid_until check was redundant.
This commit is contained in:
Nick Mathewson 2016-12-07 14:15:38 -05:00
parent b7088e5b5a
commit e50d85b90c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/entrynodes.c
View File

@ -1157,12 +1157,13 @@ sampled_guards_update_from_consensus(guard_selection_t *gs)
if (gs->type != GS_TYPE_BRIDGE) {
networkstatus_t *ns = networkstatus_get_live_consensus(approx_time());
log_info(LD_GUARD, "Updating sampled guard status based on received "
"consensus.");
if (! ns || ns->valid_until < approx_time()) {
log_info(LD_GUARD, "Hey, there wasn't a valid consensus. Ignoring");
if (! ns) {
log_info(LD_GUARD, "No live consensus; can't update "
"sampled entry guards.");
return;
} else {
log_info(LD_GUARD, "Updating sampled guard status based on received "
"consensus.");
}
}