diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-12-12 21:09:30 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-12-12 21:09:30 +0000 |
| commit | 477438e6c72c3b365a82706417da0ccab0c2bc3a (patch) | |
| tree | f0810edbcb9914459562a0dd5004b49e70ef1141 | |
| parent | 1efd3774286e57f2faeaf37d66291a94c6aaab67 (diff) | |
| download | tor-477438e6c72c3b365a82706417da0ccab0c2bc3a.tar.gz tor-477438e6c72c3b365a82706417da0ccab0c2bc3a.zip | |
a better fix. puts r8446 to bed.
svn:r9096
| -rw-r--r-- | src/or/circuituse.c | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 42d220f1d5..dd56c4621a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1182,8 +1182,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn) } return -1; } - if (!SOCKS_COMMAND_IS_RESOLVE(conn->socks_request->command) && - !connection_ap_can_use_exit(conn, router)) { + if (!connection_ap_can_use_exit(conn, router)) { log_fn(opt ? LOG_INFO : LOG_WARN, LD_APP, "Requested exit point '%s' would refuse request. %s.", conn->chosen_exit_name, opt ? "Trying others" : "Closing"); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index c2a88ef548..9379d04a76 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2404,7 +2404,7 @@ connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit) return 0; /* Don't send DNS requests to non-exit servers by default. */ - if (policy_is_reject_star(exit->exit_policy)) + if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy)) return 0; } return 1; |