nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sebastian/bug3047'

Browse Source
This commit is contained in:
Nick Mathewson 2011-05-02 20:21:08 -04:00
commit 5b96773a40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/circuitbuild.c
View File

@ -2668,8 +2668,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
*/ */
continue; continue;
} }
if (!node_has_descriptor(node)) if (!node_has_descriptor(node)) {
n_supported[i] = -1;
continue; continue;
}
if (!node->is_running || node->is_bad_exit) { if (!node->is_running || node->is_bad_exit) {
n_supported[i] = -1; n_supported[i] = -1;
continue; /* skip routers that are known to be down or bad exits */ continue; /* skip routers that are known to be down or bad exits */
@ -2786,8 +2788,6 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
/* try once to pick only from routers that satisfy a needed port, /* try once to pick only from routers that satisfy a needed port,
* then if there are none, pick from any that support exiting. */ * then if there are none, pick from any that support exiting. */
SMARTLIST_FOREACH_BEGIN(the_nodes, const node_t *, node) { SMARTLIST_FOREACH_BEGIN(the_nodes, const node_t *, node) {
if (!node_has_descriptor(node))
continue;
if (n_supported[node_sl_idx] != -1 && if (n_supported[node_sl_idx] != -1 &&
(attempt || node_handles_some_port(node, needed_ports))) { (attempt || node_handles_some_port(node, needed_ports))) {
// log_fn(LOG_DEBUG,"Try %d: '%s' is a possibility.", // log_fn(LOG_DEBUG,"Try %d: '%s' is a possibility.",