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

bugfix: we were leaving open duplicate connections to other ORs

Browse Source 
for a week, rather than closing them once we detect a duplicate.

also, avoid some duplicate mark-for-closes in connection-housekeeping.


svn:r5752
This commit is contained in:
Roger Dingledine 2006-01-07 03:56:56 +00:00
parent 9796733e89
commit 1dd8ebf615
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/or/main.c
View File

@ -592,9 +592,13 @@ run_connection_housekeeping(int i, time_t now)
if (conn->outbuf && !buf_datalen(conn->outbuf)) if (conn->outbuf && !buf_datalen(conn->outbuf))
conn->timestamp_lastempty = now; conn->timestamp_lastempty = now;
if (conn->marked_for_close) {
/* nothing to do here */
return;
}
/* Expire any directory connections that haven't sent anything for 5 min */ /* Expire any directory connections that haven't sent anything for 5 min */
if (conn->type == CONN_TYPE_DIR && if (conn->type == CONN_TYPE_DIR &&
!conn->marked_for_close &&
conn->timestamp_lastwritten + 5*60 < now) { conn->timestamp_lastwritten + 5*60 < now) {
info(LD_DIR,"Expiring wedged directory conn (fd %d, purpose %d)", info(LD_DIR,"Expiring wedged directory conn (fd %d, purpose %d)",
conn->s, conn->purpose); conn->s, conn->purpose);
@ -615,12 +619,20 @@ run_connection_housekeeping(int i, time_t now)
return; /* we're all done here, the rest is just for OR conns */ return; /* we're all done here, the rest is just for OR conns */
#define TIME_BEFORE_OR_CONN_IS_OBSOLETE (60*60*24*7) /* a week */ #define TIME_BEFORE_OR_CONN_IS_OBSOLETE (60*60*24*7) /* a week */
if (!conn->is_obsolete && if (!conn->is_obsolete) {
conn->timestamp_created + TIME_BEFORE_OR_CONN_IS_OBSOLETE < now) { if (conn->timestamp_created + TIME_BEFORE_OR_CONN_IS_OBSOLETE < now) {
info(LD_OR, "Marking OR conn to %s:%d obsolete (fd %d, %d secs old).", info(LD_OR, "Marking OR conn to %s:%d obsolete (fd %d, %d secs old).",
conn->address, conn->port, conn->s, conn->address, conn->port, conn->s,
(int)(now - conn->timestamp_created)); (int)(now - conn->timestamp_created));
conn->is_obsolete = 1; conn->is_obsolete = 1;
} else if (connection_or_get_by_identity_digest(conn->identity_digest) !=
conn) {
info(LD_OR,
"Marking duplicate conn to %s:%d obsolete (fd %d, %d secs old).",
conn->address, conn->port, conn->s,
(int)(now - conn->timestamp_created));
conn->is_obsolete = 1;
}
} }
if (conn->is_obsolete && conn->n_circuits == 0) { if (conn->is_obsolete && conn->n_circuits == 0) {