From 119fd23f1eb560867c90cec9c4d8d7fae2c8ac1a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 17 Dec 2008 13:14:43 +0000 Subject: [PATCH] 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. svn:r17638 --- src/or/circuitbuild.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 473b67875..65bd16afe 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1162,6 +1162,8 @@ ap_stream_wants_exit_attention(connection_t *conn) 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))