aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-09-20 11:56:44 -0400
committerDavid Goulet <dgoulet@torproject.org>2017-09-20 12:52:53 -0400
commit317dabc57fcf51186e81ffa2db83a8116183866d (patch)
tree9e3b62869921568908024954f8331ac41e7ae8c8 /src/or/circuitlist.c
parent2998350122884f57c3fe5248fc819b829434f2dd (diff)
downloadtor-317dabc57fcf51186e81ffa2db83a8116183866d.tar.gz
tor-317dabc57fcf51186e81ffa2db83a8116183866d.zip
circuit: Log n_circ_id and global identifier
When we can, log the n circuit id and global identifier for origin circuit. Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index a0ff74190e..9577573ec2 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1027,6 +1027,11 @@ circuit_free(circuit_t *circ)
* "active" checks will be violated. */
cell_queue_clear(&circ->n_chan_cells);
+ log_info(LD_CIRC, "Circuit %u (id: %" PRIu32 ") has been freed.",
+ circ->n_circ_id,
+ CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0);
+
if (should_free) {
memwipe(mem, 0xAA, memlen); /* poison memory */
tor_free(mem);
@@ -1913,9 +1918,12 @@ circuit_mark_for_close_, (circuit_t *circ, int reason, int line,
smartlist_add(circuits_pending_close, circ);
- log_info(LD_GENERAL, "Circuit %u marked for close at %s:%d (orig reason: "
- "%u, new reason: %u)",
- circ->n_circ_id, file, line, orig_reason, reason);
+ log_info(LD_GENERAL, "Circuit %u (id: %" PRIu32 ") marked for close at "
+ "%s:%d (orig reason: %u, new reason: %u)",
+ circ->n_circ_id,
+ CIRCUIT_IS_ORIGIN(circ) ?
+ TO_ORIGIN_CIRCUIT(circ)->global_identifier : 0,
+ file, line, orig_reason, reason);
}
/** Called immediately before freeing a marked circuit <b>circ</b> from