[or-cvs] r17184: {tor} when building preemptive circuits, ignore streams that have (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-11-03 02:00:56 -0500 (Mon, 03 Nov 2008)
New Revision: 17184

Modified:
   tor/trunk/src/or/circuitbuild.c
Log:
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.


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-11-03 06:56:23 UTC (rev 17183)
+++ tor/trunk/src/or/circuitbuild.c	2008-11-03 07:00:56 UTC (rev 17184)
@@ -1168,7 +1168,8 @@
       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))