nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

when you expire a wedged dir conn, conn_close_if_marked will take

Browse Source 
care of trying to flush before it closes


svn:r2035
This commit is contained in:
Roger Dingledine 2004-07-13 00:38:08 +00:00
parent 149115cc4e
commit 3294b514d3
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/main.c
View File

@ -362,20 +362,7 @@ static void run_connection_housekeeping(int i, time_t now) {
!conn->marked_for_close && !conn->marked_for_close &&
conn->timestamp_lastwritten + 5*60 < now) { conn->timestamp_lastwritten + 5*60 < now) {
log_fn(LOG_WARN,"Expiring wedged directory conn (fd %d, purpose %d)", conn->s, conn->purpose); log_fn(LOG_WARN,"Expiring wedged directory conn (fd %d, purpose %d)", conn->s, conn->purpose);
if (connection_wants_to_flush(conn)) {
if(flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen) < 0) {
log_fn(LOG_WARN,"flushing expired directory conn failed.");
connection_close_immediate(conn);
connection_mark_for_close(conn); connection_mark_for_close(conn);
/* */
} else {
/* XXXX Does this next part make sense, really? */
connection_mark_for_close(conn);
conn->hold_open_until_flushed = 1; /* give it a last chance */
}
} else {
connection_mark_for_close(conn);
}
return; return;
} }