diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-12-04 22:19:04 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-12-04 22:19:04 +0000 |
| commit | ef000fd82e832984ec19a417c7d6c267f9bf24da (patch) | |
| tree | d8e7a0b2a95c2750c5925ee6c420fee9837f2966 /src/or | |
| parent | 7d032bd3002351736ada282dc058434b9d0450f8 (diff) | |
| download | tor-ef000fd82e832984ec19a417c7d6c267f9bf24da.tar tor-ef000fd82e832984ec19a417c7d6c267f9bf24da.tar.gz | |
ok, i know this one was a bug. we were expiring open general
circuits after they had been around for 30 seconds.
svn:r5496
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuituse.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e74a62e34..da0e18ff9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -223,19 +223,13 @@ circuit_expire_building(time_t now) * intro or rend, then mark it for close */ if (victim->state == CIRCUIT_STATE_OPEN) { switch (victim->purpose) { - case CIRCUIT_PURPOSE_OR: - case CIRCUIT_PURPOSE_INTRO_POINT: - case CIRCUIT_PURPOSE_REND_POINT_WAITING: - case CIRCUIT_PURPOSE_REND_ESTABLISHED: - /* OR-side. We can't actually reach this point because of the - * IS_ORIGIN test above. */ + default: /* most open circuits can be left alone. */ continue; /* yes, continue inside a switch refers to the nearest * enclosing loop. C is smart. */ - case CIRCUIT_PURPOSE_C_ESTABLISH_REND: case CIRCUIT_PURPOSE_C_INTRODUCING: case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: - break; + break; /* too old, need to die */ case CIRCUIT_PURPOSE_C_REND_READY: /* it's a rend_ready circ -- has it already picked a query? */ /* c_rend_ready circs measure age since timestamp_dirty, |