]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
circuit: Avoid needless log info in circuit_get_best()
authorDavid Goulet <dgoulet@torproject.org>
Thu, 24 Aug 2017 13:00:18 +0000 (09:00 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 24 Aug 2017 17:03:29 +0000 (13:03 -0400)
When looking for an introduction circuit in circuit_get_best(), we log an info
message if we are about to launch a new intro circuit in parallel. However,
the condition was considering marked for close circuit leading to the function
triggering the log info even though there is actually no valid intro circuit.

Signed-off-by: David Goulet <dgoulet@torproject.org>
src/or/circuituse.c

index 93bccf0eb854eee0da1d89130ca509f441b3fa2c..2472ac54521255d0a6a07b9995dff3f81b29d5e8 100644 (file)
@@ -337,7 +337,8 @@ circuit_get_best(const entry_connection_t *conn,
     /* Log an info message if we're going to launch a new intro circ in
      * parallel */
     if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT &&
-        !must_be_open && origin_circ->hs_circ_has_timed_out) {
+        !must_be_open && origin_circ->hs_circ_has_timed_out &&
+        !circ->marked_for_close) {
         intro_going_on_but_too_old = 1;
         continue;
     }