[tor-commits] [tor/master] circuit: Log circuit identifiers when cannibalizing

[nickm at torproject.org]

commit 767b1815e9c02b1ee45f1853b32878fb1bc806c7
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Sep 25 16:08:11 2017 -0400

    circuit: Log circuit identifiers when cannibalizing
    
    This removes the "nickname" of the cannibalized circuit last hop as it is
    useless. It now logs the n_circ_id and global identifier so we can match it
    with other logging statement.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/circuituse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 343ce3bcf..e2b21df01 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1904,8 +1904,9 @@ circuit_launch_by_extend_info(uint8_t purpose,
       uint8_t old_purpose = circ->base_.purpose;
       struct timeval old_timestamp_began = circ->base_.timestamp_began;
 
-      log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)",
-               build_state_get_exit_nickname(circ->build_state), purpose,
+      log_info(LD_CIRC, "Cannibalizing circ %u (id: %" PRIu32 ") for "
+                        "purpose %d (%s)",
+               TO_CIRCUIT(circ)->n_circ_id, circ->global_identifier, purpose,
                circuit_purpose_to_string(purpose));
 
       if ((purpose == CIRCUIT_PURPOSE_S_CONNECT_REND ||