diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-11-01 23:49:14 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-11-01 23:49:14 +0000 |
| commit | 3e5a584d37b0771152fd96131a0aa8d486d5b2fc (patch) | |
| tree | c275cb568522907955616b3114c735e350f87122 | |
| parent | 8c78a68cc07a5c51f096716423a75dcb1e76f7e8 (diff) | |
| download | tor-3e5a584d37b0771152fd96131a0aa8d486d5b2fc.tar.gz tor-3e5a584d37b0771152fd96131a0aa8d486d5b2fc.zip | |
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:r17181
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 02414c69ad..f9e7981106 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1167,6 +1167,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)) |