diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-04-15 01:08:59 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-04-15 01:08:59 +0000 |
| commit | 26c1c8f173c0d7c7ac0b882ac12e88a74976d538 (patch) | |
| tree | 24dd6ab0eafc89b97eae739f97fb94cbbb60c559 /src/or/circuit.c | |
| parent | ac38746b3b2f0230695808ce715614e64ef1f7c2 (diff) | |
| download | tor-26c1c8f173c0d7c7ac0b882ac12e88a74976d538.tar.gz tor-26c1c8f173c0d7c7ac0b882ac12e88a74976d538.zip | |
make unattached rend streams expire after a while (60s)
(they were darned persistent)
also make intro circs that are waiting for acks expire after a while (20s)
svn:r1628
Diffstat (limited to 'src/or/circuit.c')
| -rw-r--r-- | src/or/circuit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c index 78a16b9d1d..44e5d438a6 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -485,12 +485,12 @@ void circuit_expire_building(time_t now) { victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) && victim->timestamp_dirty + MIN_SECONDS_BEFORE_EXPIRING_CIRC > now)) { if(victim->n_conn) - log_fn(LOG_INFO,"Abandoning circ %s:%d:%d (state %d:%s)", + log_fn(LOG_INFO,"Abandoning circ %s:%d:%d (state %d:%s, purpose %d)", victim->n_conn->address, victim->n_port, victim->n_circ_id, - victim->state, circuit_state_to_string[victim->state]); + victim->state, circuit_state_to_string[victim->state], victim->purpose); else - log_fn(LOG_INFO,"Abandoning circ %d (state %d:%s)", victim->n_circ_id, - victim->state, circuit_state_to_string[victim->state]); + log_fn(LOG_INFO,"Abandoning circ %d (state %d:%s, purpose %d)", victim->n_circ_id, + victim->state, circuit_state_to_string[victim->state], victim->purpose); circuit_log_path(LOG_INFO,victim); circuit_mark_for_close(victim); } |