[tor-commits] [tor/master] circuit: Avoid needless log info in circuit_get_best()

[nickm@xxxxxxxxxxxxxx]

commit 1077e9894cd60d9b991e38d965e57be00fd83277
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Thu Aug 24 09:00:18 2017 -0400

    circuit: Avoid needless log info in circuit_get_best()
    
    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@xxxxxxxxxxxxxx>
---
 src/or/circuituse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 93bccf0eb..2472ac545 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -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;
     }



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits