commit f1ebe6bda4f541a54648d02e2d51fc9073c3786d Author: rl1987 <rl1987@sdf.lonestar.org> Date: Sun Oct 26 20:56:15 2014 +0200 Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag. --- changes/bug13066 | 4 ++++ src/or/or.h | 8 ++++++++ src/or/routerlist.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug13066 b/changes/bug13066 new file mode 100644 index 0000000..388c999 --- /dev/null +++ b/changes/bug13066 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix node selection logic in smartlist_choose_node_by_bandwidth() + so that onion routers with BadExit flag are not considered to be + worthy candidates. Fixes issue 13066. diff --git a/src/or/or.h b/src/or/or.h index 115b92d..2c79c13 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3228,6 +3228,14 @@ static const or_circuit_t *CONST_TO_OR_CIRCUIT(const circuit_t *); static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static const origin_circuit_t *CONST_TO_ORIGIN_CIRCUIT(const circuit_t *); +/** Return 1 iff <b>node</b> has Exit flag and no BadExit flag. + * Otherwise, return 0. + */ +static INLINE int node_is_good_exit(const node_t *node) +{ + return node->is_exit && ! node->is_bad_exit; +} + static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) { tor_assert(x->magic == OR_CIRCUIT_MAGIC); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4d117cb..642b971 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2202,7 +2202,7 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl, uint32_t this_bw = 0; i = node_sl_idx; - is_exit = node->is_exit; + is_exit = node_is_good_exit(node); is_guard = node->is_possible_guard; if (node->rs) { if (node->rs->has_bandwidth) {