From d499de58132fd45f8e20d508641e0ded392d045f Mon Sep 17 00:00:00 2001 From: Mike Perry Date: Wed, 20 Sep 2023 23:35:36 +0000 Subject: [PATCH] Bug 40862: Check if circuits are unused more ways --- src/core/or/conflux_pool.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c index 46d36cf106..4a7e941372 100644 --- a/src/core/or/conflux_pool.c +++ b/src/core/or/conflux_pool.c @@ -1322,7 +1322,12 @@ count_client_usable_sets(void) log_warn(LD_BUG, "Client conflux linked set leg without a circuit"); continue; } - if (!CONST_TO_ORIGIN_CIRCUIT(leg->circ)->unusable_for_new_conns) { + + /* The maze marks circuits used several different ways. If any of + * them are marked for this leg, launch a new one. */ + if (!CONST_TO_ORIGIN_CIRCUIT(leg->circ)->unusable_for_new_conns && + !CONST_TO_ORIGIN_CIRCUIT(leg->circ)->isolation_values_set && + !leg->circ->timestamp_dirty) { count++; } } DIGEST256MAP_FOREACH_END;