aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-01 07:25:18 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-01 07:25:18 +0000
commitcd25e56ad22d37ac20cc8376b80df3e4b512dad4 (patch)
treeb2ec615b3fa79cc9a1181f8c33826d75832ec142
parent73f6c1531e44a843933284da81f3d4f6431572ce (diff)
downloadtor-cd25e56ad22d37ac20cc8376b80df3e4b512dad4.tar.gz
tor-cd25e56ad22d37ac20cc8376b80df3e4b512dad4.zip
when the or-connect succeeded and the tls handshake succeeded
but we didn't like the result, we were closing the connection without sending any destroys back for the pending circuits. now send those destroys anyway; i hope this doesn't break too much. svn:r3951
-rw-r--r--src/or/circuituse.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 4bf7bc5fdf..38efe26899 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -479,10 +479,8 @@ void circuit_about_to_close_connection(connection_t *conn) {
switch (conn->type) {
case CONN_TYPE_OR:
- if (conn->state != OR_CONN_STATE_OPEN) {
- /* Inform any pending (not attached) circs that they should give up. */
- circuit_n_conn_done(conn, 0);
- }
+ /* Inform any pending (not attached) circs that they should give up. */
+ circuit_n_conn_done(conn, 0);
/* Now close all the attached circuits on it. */
while ((circ = circuit_get_by_conn(conn))) {
if (circ->n_conn == conn) /* it's closing in front of us */