浏览代码

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.
Roger Dingledine 16 年之前
父节点
当前提交
95008db08d
共有 2 个文件被更改,包括 1 次插入9 次删除
  1. 0 2
      ChangeLog
  2. 1 7
      src/or/connection_edge.c

+ 0 - 2
ChangeLog

@@ -40,8 +40,6 @@ Changes in version 0.2.1.20 - 2009-??-??
       excluded in ExcludeExitNodes, but the circuit is not used to access
       excluded in ExcludeExitNodes, but the circuit is not used to access
       the outside world. This should help fix bug 1090. Bugfix on
       the outside world. This should help fix bug 1090. Bugfix on
       0.2.1.6-alpha.
       0.2.1.6-alpha.
-    - Teach connection_ap_can_use_exit to respect the Exclude*Nodes config
-      options. Should fix bug 1090. Bugfix on 0.0.2-pre16.
     - Avoid segfault in rare cases when finishing an introduction circuit
     - Avoid segfault in rare cases when finishing an introduction circuit
       as a client and finding out that we don't have an introduction key
       as a client and finding out that we don't have an introduction key
       for it. Fixes bug 1073. Reported by Aaron Swartz.
       for it. Fixes bug 1073. Reported by Aaron Swartz.

+ 1 - 7
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>
 /** 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.
  * 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
  * (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
 int
 connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
 connection_ap_can_use_exit(edge_connection_t *conn, routerinfo_t *exit)
 {
 {
-  or_options_t *options = get_options();
-
   tor_assert(conn);
   tor_assert(conn);
   tor_assert(conn->_base.type == CONN_TYPE_AP);
   tor_assert(conn->_base.type == CONN_TYPE_AP);
   tor_assert(conn->socks_request);
   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))
     if (!conn->chosen_exit_name && policy_is_reject_star(exit->exit_policy))
       return 0;
       return 0;
   }
   }
-  if (options->_ExcludeExitNodesUnion &&
-      routerset_contains_router(options->_ExcludeExitNodesUnion, exit))
-    return 0;
-
   return 1;
   return 1;
 }
 }