summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-20 17:27:54 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-20 17:27:54 +0000
commit3c250a2fedc1db1a7f3847318cdafb0929a849cb (patch)
treea6da207f98598280d9bb37baf3fdd38e449c9a2d
parent06a60c4fbba5f1853d6d8a4b9e2dd1b705225f72 (diff)
downloadtor-3c250a2fedc1db1a7f3847318cdafb0929a849cb.tar.gz
tor-3c250a2fedc1db1a7f3847318cdafb0929a849cb.zip
only expire wedged dir conns that haven't already been expired
svn:r1676
-rw-r--r--src/or/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 3b583798a0..ee3d24cf5d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -307,6 +307,7 @@ static void run_connection_housekeeping(int i, time_t now) {
connection_t *conn = connection_array[i];
if(conn->type == CONN_TYPE_DIR &&
+ !conn->marked_for_close &&
conn->timestamp_lastwritten + 5*60 < now) {
log_fn(LOG_WARN,"Expiring wedged directory conn (purpose %d)", conn->purpose);
connection_mark_for_close(conn,0);