From: Roger Dingledine <arma@torproject.org>
Date: Thu, 20 May 2004 22:39:01 +0000 (+0000)
Subject: fix a double mark-for-close
X-Git-Tag: tor-0.0.7rc1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8417dfac88ae351db38b2f0cf970625937ef5a4;p=thirdparty%2Ftor.git

fix a double mark-for-close


svn:r1913
---

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) {