From 4cb59ceb8ef603f5661f87e4787d45255fbe210c Mon Sep 17 00:00:00 2001 From: Matthew Finkel Date: Sat, 31 Jan 2015 09:34:24 +0000 Subject: Only retry connecting to configured bridges After connectivity problems, only try connecting to bridges which are currently configured; don't mark bridges which we previously used but are no longer configured. Fixes 14216. Reported by and fix provided by arma. --- src/or/entrynodes.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/or') diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5b0e342662..17cb825de3 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2368,7 +2368,9 @@ entries_retry_helper(const or_options_t *options, int act) SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) { node = node_get_by_id(e->identity); if (node && node_has_descriptor(node) && - node_is_bridge(node) == need_bridges) { + node_is_bridge(node) == need_bridges && + (!need_bridges || (!e->bad_since && + node_is_a_configured_bridge(node)))) { any_known = 1; if (node->is_running) any_running = 1; /* some entry is both known and running */ -- cgit v1.2.3-54-g00ecf