diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-05-20 22:39:01 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-05-20 22:39:01 +0000 |
| commit | a8417dfac88ae351db38b2f0cf970625937ef5a4 (patch) | |
| tree | c515ef74293d9131c4001d38f57d743a37f51c92 | |
| parent | ccb825128e60e924c9f2c106d94c4519d4393d8e (diff) | |
| download | tor-a8417dfac88ae351db38b2f0cf970625937ef5a4.tar.gz tor-a8417dfac88ae351db38b2f0cf970625937ef5a4.zip | |
fix a double mark-for-close
svn:r1913
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 82e28e4091..3cbd54d154 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -317,7 +317,8 @@ void connection_ap_attach_pending(void) for (i = 0; i < n; ++i) { conn = carray[i]; - if (conn->type != CONN_TYPE_AP || + if (conn->marked_for_close || + conn->type != CONN_TYPE_AP || conn->state != AP_CONN_STATE_CIRCUIT_WAIT) continue; if(connection_ap_handshake_attach_circuit(conn) < 0) { |