commit e50d85b90cb3fbc562517c11ded12940682ffec0 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 7 14:15:38 2016 -0500
Clean check for live consensus when updating the guard sample.
The valid_until check was redundant. --- src/or/entrynodes.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index ad9242e..f41464a 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -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."); } }