[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #14216 [Tor]: We only "optimistically retry connections" once if we have other bridges descs
#14216: We only "optimistically retry connections" once if we have other bridges
descs
------------------------+--------------------------------------
Reporter: arma | Owner:
Type: defect | Status: new
Priority: normal | Milestone: Tor: 0.2.6.x-final
Component: Tor | Version:
Resolution: | Keywords: tor-bridge, 025-backport
Actual Points: | Parent ID:
Points: |
------------------------+--------------------------------------
Comment (by arma):
The overly simple fix is just
{{{
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index b18aabe..a057ae4 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2357,7 +2357,8 @@ 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 || node_is_a_configured_bridge(node))) {
any_known = 1;
if (node->is_running)
any_running = 1; /* some entry is both known and running */
}}}
I say overly simple because I think there's still an edge case where you
could have a bridge with the same descriptor that offers both obfs3 and
meek, and specify the fingerprint in your torrc file, and
node_is_a_configured_bridge() will ignore addr:port and say "yes it's a
configured bridge" if the digest matches. But I'm tempted to say that's a
separate bug in node_is_a_configured_bridge().
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/14216#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs