torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: looks like clients since 0.1.1.10-alpha have been

Browse Source 
expiring connections whenever 5 minutes pass and they *do*
have circuits on them.


svn:r6213
This commit is contained in:
Roger Dingledine
2006-03-21 21:58:00 +00:00
parent 65b575c03d
commit a3329036a8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/main.c
+3 -3
View File
@@ -675,7 +675,7 @@ run_connection_housekeeping(int i, time_t now)
}
}
if (conn->is_obsolete && conn->n_circuits == 0) {
if (conn->is_obsolete && !conn->n_circuits) {
/* no unmarked circs -- mark it now */
log_info(LD_OR,
"Expiring non-used OR connection to fd %d (%s:%d) [Obsolete].",
@@ -694,14 +694,14 @@ run_connection_housekeeping(int i, time_t now)
conn->s,conn->address, conn->port);
connection_mark_for_close(conn);
conn->hold_open_until_flushed = 1;
} else if (we_are_hibernating() && conn->n_circuits == 0 &&
} else if (we_are_hibernating() && !conn->n_circuits &&
!buf_datalen(conn->outbuf)) {
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
"[Hibernating or exiting].",
conn->s,conn->address, conn->port);
connection_mark_for_close(conn);
conn->hold_open_until_flushed = 1;
} else if (!clique_mode(options) && conn->n_circuits &&
} else if (!clique_mode(options) && !conn->n_circuits &&
(!router || !server_mode(options) ||
!router_is_clique_mode(router))) {
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "