From 76eed8cc18c55693fe47226572417fe4b8348fdc Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 17 Dec 2008 13:14:47 +0000 Subject: Backport r17184: when building preemptive circuits, ignore streams that have a chosen exit node in mind already. otherwise we get tricked into trying to build a new circuit that will handle them. svn:r17639 --- src/or/circuitbuild.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/or') diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 65bd16afea..49ac74d65b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1163,7 +1163,8 @@ ap_stream_wants_exit_attention(connection_t *conn) conn->state == AP_CONN_STATE_CIRCUIT_WAIT && !conn->marked_for_close && !(TO_EDGE_CONN(conn)->want_onehop) && /* ignore one-hop streams */ - !(TO_EDGE_CONN(conn)->use_begindir) && /* ignore targetted dir fetches */ + !(TO_EDGE_CONN(conn)->use_begindir) && /* ignore targeted dir fetches */ + !(TO_EDGE_CONN(conn)->chosen_exit_name) && /* ignore defined streams */ !connection_edge_is_rendezvous_stream(TO_EDGE_CONN(conn)) && !circuit_stream_is_being_handled(TO_EDGE_CONN(conn), 0, MIN_CIRCUITS_HANDLING_STREAM)) -- cgit v1.2.3-54-g00ecf