diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2010-06-14 22:47:45 -0700 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@fscked.org> | 2010-06-15 16:41:24 -0700 |
| commit | f528a6e62b75538a39b113f67e38fb947c80739e (patch) | |
| tree | 2a9cf8e6dc153fd15600de206a3a9147eabf9ad2 /src/or/circuituse.c | |
| parent | 473f0c3ebbf153366385c41de8921119525c072c (diff) | |
| download | tor-f528a6e62b75538a39b113f67e38fb947c80739e.tar.gz tor-f528a6e62b75538a39b113f67e38fb947c80739e.zip | |
Fix initialization and reset issues with close_ms.
Also clean up some log messages.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 5696d9c6f0..5127ca6e3d 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -378,7 +378,7 @@ circuit_expire_building(time_t now) */ if (now - victim->timestamp_created > 2*circ_times.close_ms/1000+1) { log_notice(LD_CIRC, - "Extremely large value for circuit build timeout: %ld. " + "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump.", now - victim->timestamp_created); } else if (circuit_build_times_add_timeout(&circ_times, first_hop_succeeded, @@ -715,6 +715,9 @@ circuit_expire_old_circuits_clientside(time_t now) circ->n_circ_id, (int)(now - circ->timestamp_dirty), circ->purpose); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); + // XXX: Do we ever mark non-dirty odd-purpose circuits for close? + // XXX: See irc backlog. Want to log for those circuits not mentioned. + // But remember to add flag. this is called 1x/sec } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN && circ->purpose == CIRCUIT_PURPOSE_C_GENERAL) { |