nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and a question

Browse Source 
svn:r3815
This commit is contained in:
Roger Dingledine 2005-03-22 20:04:00 +00:00
parent 7a0072cc1a
commit 8a763b5ae3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/main.c
View File

@ -681,19 +681,20 @@ static void run_connection_housekeeping(int i, time_t now) {
conn->hold_open_until_flushed = 1;
} else if (we_are_hibernating() && !circuit_get_by_conn(conn) &&
!buf_datalen(conn->outbuf)) {
log_fn(LOG_INFO,"Expiring non-used OR connection to %d (%s:%d). [Hibernating.]",
log_fn(LOG_INFO,"Expiring non-used OR connection to %d (%s:%d) [Hibernating or exiting].",
i,conn->address, conn->port);
connection_mark_for_close(conn);
conn->hold_open_until_flushed = 1;
} else if (!clique_mode(options) && !circuit_get_by_conn(conn) &&
(!router || !server_mode(options) || !router_is_clique_mode(router))) {
log_fn(LOG_INFO,"Expiring non-used connection to %d (%s:%d). [Not in clique mode]",
log_fn(LOG_INFO,"Expiring non-used connection to %d (%s:%d) [Not in clique mode].",
i,conn->address, conn->port);
connection_mark_for_close(conn);
conn->hold_open_until_flushed = 1;
} else if (buf_datalen(conn->outbuf) &&
// XXX will this have races were stuff just got written to the conn and we kill it?
now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) {
log_fn(LOG_INFO,"Expiriing stuck connection to %d (%s:%d).",
log_fn(LOG_INFO,"Expiring stuck connection to %d (%s:%d).",
i, conn->address, conn->port);
connection_mark_for_close(conn);
} else {