aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-03-03 08:46:18 +0000
committerRoger Dingledine <arma@torproject.org>2004-03-03 08:46:18 +0000
commit419a672222aeeb5f021e43ce468686828d784621 (patch)
treedb283437c2194a6d39a35e6e2904adbaf3da33db /src/or/connection.c
parent6022bfea11bc3f89b9baf787563203b36779361e (diff)
downloadtor-419a672222aeeb5f021e43ce468686828d784621.tar
tor-419a672222aeeb5f021e43ce468686828d784621.tar.gz
holding until flush was borked
we were never writing anything when hold_open_until_flushed was set, since conn_write returns early if marked_for_conn is set. seems a bit better now. svn:r1214
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 1ec9df300..c20a8b041 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -226,6 +226,7 @@ void connection_expire_held_open(void)
if (conn->hold_open_until_flushed) {
assert(conn->marked_for_close);
if (now - conn->timestamp_lastwritten >= 15) {
+ log_fn(LOG_WARN,"Giving up on marked_for_close conn that's been flushing for 15s (fd %d, type %d, state %d).", conn->s, conn->type, conn->state);
conn->hold_open_until_flushed = 0;
}
}