torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't expire joined-rend circs that have an exit connection attached

Browse Source 
and don't expire non-general excess circuits


svn:r1728
This commit is contained in:
Roger Dingledine
2004-04-27 10:16:31 +00:00
parent 873564ea9c
commit 8e8af6aaee
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/circuit.c
+8 -5
View File
@@ -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.