[or-cvs] r17638: {tor} Backport r17181: fix the other half of r17091. now that best (tor/branches/tor-0_2_0-patches/src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-12-17 08:14:43 -0500 (Wed, 17 Dec 2008)
New Revision: 17638

Modified:
   tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c
Log:
Backport r17181: fix the other half of r17091. now that best_support can be -1, we were complaining about no support for our one-hop streams, when in fact choose_good_exit_server_general() has no business caring about one-hop streams. patch from miner.

Modified: tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c	2008-12-17 13:14:40 UTC (rev 17637)
+++ tor/branches/tor-0_2_0-patches/src/or/circuitbuild.c	2008-12-17 13:14:43 UTC (rev 17638)
@@ -1162,6 +1162,8 @@
   if (conn->type == CONN_TYPE_AP &&
       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 */
       !connection_edge_is_rendezvous_stream(TO_EDGE_CONN(conn)) &&
       !circuit_stream_is_being_handled(TO_EDGE_CONN(conn), 0,
                                        MIN_CIRCUITS_HANDLING_STREAM))