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

Revert "Avoid a double-mark in connection_or_close_connection_cb"

Browse Source 
This reverts commit 633071eb3b.
This commit is contained in:
Nick Mathewson 2011-12-06 19:49:20 -05:00
parent 17880e4c0a
commit 3a17a1a62f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/connection_or.c
View File

@ -1162,12 +1162,10 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn)
static void static void
connection_or_close_connection_cb(void *_conn) connection_or_close_connection_cb(void *_conn)
{ {
or_connection_t *or_conn = _conn; or_connection_t *conn = _conn;
connection_t *conn = TO_CONN(or_conn);
connection_stop_reading(conn); connection_stop_reading(TO_CONN(conn));
if (!conn->marked_for_close) connection_mark_for_close(TO_CONN(conn));
connection_mark_for_close(conn);
} }
/** Move forward with the tls handshake. If it finishes, hand /** Move forward with the tls handshake. If it finishes, hand