aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-09-20 23:50:48 -0400
committerRoger Dingledine <arma@torproject.org>2009-09-20 23:50:48 -0400
commit95008db08d1bb5d7b608654fc1a115a42cd15252 (patch)
treec10852e836136a12954e76e9e497e9ac4ab98985 /src/or
parent9c38941195309c3d9a8620536f7f7246c780b9c7 (diff)
downloadtor-95008db08d1bb5d7b608654fc1a115a42cd15252.tar
tor-95008db08d1bb5d7b608654fc1a115a42cd15252.tar.gz
Revert "Teach connection_ap_can_use_exit about Exclude*Nodes"
This reverts commit dc3229313b6d2aaff437c6fc7fa55ead4409e93d. We're going to do this more thoroughly in 0.2.2.x, and not in maint-0.2.1.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_edge.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index ba1304a65..d699591cd 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2851,13 +2851,11 @@ connection_edge_is_rendezvous_stream(edge_connection_t *conn)
/** Return 1 if router <b>exit</b> is likely to allow stream <b>conn</b>
* to exit from it, or 0 if it probably will not allow it.
* (We might be uncertain if conn's destination address has not yet been
- * resolved.) If the router is in the list of excluded nodes, also return 0;
+ * resolved.)
*/
int
connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
{
- or_options_t *options = get_options();
-
tor_assert(conn);
tor_assert(conn->_base.type == CONN_TYPE_AP);
tor_assert(conn->socks_request);
@@ -2903,10 +2901,6 @@ connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy))
return 0;
}
- if (options->_ExcludeExitNodesUnion &&
- routerset_contains_router(options->_ExcludeExitNodesUnion, exit))
- return 0;
-
return 1;
}