[or-cvs] fix a double mark-for-close

Roger Dingledine arma at seul.org
Thu May 20 22:39:03 UTC 2004


Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	connection_edge.c 
Log Message:
fix a double mark-for-close


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- connection_edge.c	20 May 2004 04:16:43 -0000	1.191
+++ connection_edge.c	20 May 2004 22:39:01 -0000	1.192
@@ -317,7 +317,8 @@
 
   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) {



More information about the tor-commits mailing list