commit 2755b09c52f78f233ed96aef41d283eb52cc89e8 Author: Sebastian Hahn sebastian@torproject.org Date: Sat Feb 25 17:58:09 2012 +0100

Don't cannibalize already cannibalized circuits

This ensures we don't build circuits that have 5 hops or more. Patch contributed by wanoskarnet, thanks! --- changes/bug5231 | 5 +++++ src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/changes/bug5231 b/changes/bug5231 new file mode 100644 index 0000000..f64f7b6 --- /dev/null +++ b/changes/bug5231 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Ensure we don't cannibalize circuits that are longer than three hops + already, so we don't end up making circuits with 5 or more hops. Patch + contributed by wanoskarnet. Fixes bug 5231; bugfix on 0.1.0.1-rc which + introduced cannibalization. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 49a9b05..85f5291 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1086,6 +1086,7 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, (!need_capacity || circ->build_state->need_capacity) && (internal == circ->build_state->is_internal) && circ->remaining_relay_early_cells && + circ->build_state->desired_path_len == DEFAULT_ROUTE_LEN && !circ->build_state->onehop_tunnel && !circ->isolation_values_set) { if (info) {