nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call connection_or_close_normally() rather than using connection_mark_for_close()/connection_mark_and_flush() in run_connection_housekeeping() of main.c so that channels get sent to the CLOSING state correctly (avoids an assert otherwise)

Browse Source
This commit is contained in:
Andrea Shepard 2012-09-10 01:31:08 -07:00 committed by Andrea Shepard
parent 07f9e8fc7d
commit 72251385b0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/main.c
View File

@ -1071,13 +1071,13 @@ run_connection_housekeeping(int i, time_t now)
connection_or_connect_failed(TO_OR_CONN(conn), connection_or_connect_failed(TO_OR_CONN(conn),
END_OR_CONN_REASON_TIMEOUT, END_OR_CONN_REASON_TIMEOUT,
"Tor gave up on the connection"); "Tor gave up on the connection");
connection_mark_and_flush(conn); connection_or_close_normally(TO_OR_CONN(conn), 1);
} else if (!connection_state_is_open(conn)) { } else if (!connection_state_is_open(conn)) {
if (past_keepalive) { if (past_keepalive) {
/* We never managed to actually get this connection open and happy. */ /* We never managed to actually get this connection open and happy. */
log_info(LD_OR,"Expiring non-open OR connection to fd %d (%s:%d).", log_info(LD_OR,"Expiring non-open OR connection to fd %d (%s:%d).",
(int)conn->s,conn->address, conn->port); (int)conn->s,conn->address, conn->port);
connection_mark_for_close(conn); connection_or_close_normally(TO_OR_CONN(conn), 0);
} }
} else if (we_are_hibernating() && } else if (we_are_hibernating() &&
!connection_or_get_num_circuits(or_conn) && !connection_or_get_num_circuits(or_conn) &&
@ -1086,14 +1086,14 @@ run_connection_housekeeping(int i, time_t now)
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
"[Hibernating or exiting].", "[Hibernating or exiting].",
(int)conn->s,conn->address, conn->port); (int)conn->s,conn->address, conn->port);
connection_mark_and_flush(conn); connection_or_close_normally(TO_OR_CONN(conn), 1);
} else if (!connection_or_get_num_circuits(or_conn) && } else if (!connection_or_get_num_circuits(or_conn) &&
now >= or_conn->timestamp_last_added_nonpadding + now >= or_conn->timestamp_last_added_nonpadding +
IDLE_OR_CONN_TIMEOUT) { IDLE_OR_CONN_TIMEOUT) {
log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) "
"[idle %d].", (int)conn->s,conn->address, conn->port, "[idle %d].", (int)conn->s,conn->address, conn->port,
(int)(now - or_conn->timestamp_last_added_nonpadding)); (int)(now - or_conn->timestamp_last_added_nonpadding));
connection_mark_for_close(conn); connection_or_close_normally(TO_OR_CONN(conn), 0);
} else if ( } else if (
now >= or_conn->timestamp_lastempty + options->KeepalivePeriod*10 && now >= or_conn->timestamp_lastempty + options->KeepalivePeriod*10 &&
now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) { now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) {
@ -1103,7 +1103,7 @@ run_connection_housekeeping(int i, time_t now)
(int)conn->s, conn->address, conn->port, (int)conn->s, conn->address, conn->port,
(int)connection_get_outbuf_len(conn), (int)connection_get_outbuf_len(conn),
(int)(now-conn->timestamp_lastwritten)); (int)(now-conn->timestamp_lastwritten));
connection_mark_for_close(conn); connection_or_close_normally(TO_OR_CONN(conn), 0);
} else if (past_keepalive && !connection_get_outbuf_len(conn)) { } else if (past_keepalive && !connection_get_outbuf_len(conn)) {
/* send a padding cell */ /* send a padding cell */
log_fn(LOG_DEBUG,LD_OR,"Sending keepalive to (%s:%d)", log_fn(LOG_DEBUG,LD_OR,"Sending keepalive to (%s:%d)",