From 8e8af6aaee4c760e051f114df2295a9cd67364cd Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 27 Apr 2004 10:16:31 +0000 Subject: don't expire joined-rend circs that have an exit connection attached and don't expire non-general excess circuits svn:r1728 --- src/or/circuit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/or/circuit.c b/src/or/circuit.c index 731e54742..37c9fa4ab 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -1231,13 +1231,16 @@ void circuit_expire_old_circuits(void) { */ if (circ->timestamp_dirty && circ->timestamp_dirty + options.NewCircuitPeriod < now && - !circ->p_conn && - !circ->p_streams) { - log_fn(LOG_DEBUG,"Closing n_circ_id %d",circ->n_circ_id); + !circ->p_conn && /* we're the origin */ + !circ->p_streams && /* AP connections */ + !circ->n_streams /* exit connections */ ) { + log_fn(LOG_DEBUG,"Closing n_circ_id %d (dirty %d secs ago)",circ->n_circ_id, + (int)(now - circ->timestamp_dirty)); circuit_mark_for_close(circ); } else if (!circ->timestamp_dirty && CIRCUIT_IS_ORIGIN(circ) && - circ->state == CIRCUIT_STATE_OPEN) { - /* Also, gather a list of open unused circuits that we created. + circ->state == CIRCUIT_STATE_OPEN && + circ->purpose == CIRCUIT_PURPOSE_C_GENERAL) { + /* Also, gather a list of open unused general circuits that we created. * Because we add elements to the front of global_circuitlist, * the last elements of unused_open_circs will be the oldest * ones. -- cgit v1.2.3