[or-cvs] r17181: {tor} fix the other half of r17091. now that best_support can be - (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-11-01 19:49:14 -0400 (Sat, 01 Nov 2008)
New Revision: 17181

Modified:
   tor/trunk/src/or/circuitbuild.c
Log:
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/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-11-01 20:28:10 UTC (rev 17180)
+++ tor/trunk/src/or/circuitbuild.c	2008-11-01 23:49:14 UTC (rev 17181)
@@ -1167,6 +1167,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))