diff options
author | Nick Mathewson <nickm@torproject.org> | 2006-10-09 15:47:27 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2006-10-09 15:47:27 +0000 |
commit | b76fd968b4d2deddf2f40f63dc04713f45649c68 (patch) | |
tree | 7fc3e02f66375ba7c0513709b4bcc2de0a06bdec /src/or/circuituse.c | |
parent | 17abfa6a6afa352ea5fcb0eddbc4539cd96e448c (diff) | |
download | tor-b76fd968b4d2deddf2f40f63dc04713f45649c68.tar.gz tor-b76fd968b4d2deddf2f40f63dc04713f45649c68.zip |
r8972@totoro: nickm | 2006-10-09 10:36:22 -0400
Patch from Mike Perry: add a REASON field to closed and failed circ events.
svn:r8671
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r-- | src/or/circuituse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index dceef0af24..65bf2f9e67 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -265,7 +265,7 @@ circuit_expire_building(time_t now) circuit_state_to_string(victim->state), victim->purpose); circuit_log_path(LOG_INFO,LD_CIRC,TO_ORIGIN_CIRCUIT(victim)); - circuit_mark_for_close(victim, END_CIRC_AT_ORIGIN); + circuit_mark_for_close(victim, END_CIRC_REASON_CONNECTFAILED); } } @@ -583,7 +583,7 @@ circuit_expire_old_circuits(time_t now) log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %d secs ago, purp %d)", circ->n_circ_id, (int)(now - circ->timestamp_dirty), circ->purpose); - circuit_mark_for_close(circ, END_CIRC_AT_ORIGIN); + circuit_mark_for_close(circ, END_CIRC_REASON_REQUESTED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN && circ->purpose == CIRCUIT_PURPOSE_C_GENERAL) { @@ -591,7 +591,7 @@ circuit_expire_old_circuits(time_t now) log_debug(LD_CIRC, "Closing circuit that has been unused for %d seconds.", (int)(now - circ->timestamp_created)); - circuit_mark_for_close(circ, END_CIRC_AT_ORIGIN); + circuit_mark_for_close(circ, END_CIRC_REASON_REQUESTED); } } } @@ -674,7 +674,7 @@ circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) void circuit_has_opened(origin_circuit_t *circ) { - control_event_circuit_status(circ, CIRC_EVENT_BUILT); + control_event_circuit_status(circ, CIRC_EVENT_BUILT, 0); switch (TO_CIRCUIT(circ)->purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: |