Revert "Avoid a double-mark in connection_or_close_connection_cb"

This reverts commit 633071eb3b.
This commit is contained in:
Nick Mathewson 2011-12-06 19:49:20 -05:00
parent 17880e4c0a
commit 3a17a1a62f

View File

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