[or-cvs] We were neglecting to unlink marked circuits from soon-to-c...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv12611/src/or

Modified Files:
	circuitlist.c 
Log Message:
We were neglecting to unlink marked circuits from soon-to-close OR connections.

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- circuitlist.c	5 Dec 2005 19:01:34 -0000	1.81
+++ circuitlist.c	5 Dec 2005 19:26:09 -0000	1.82
@@ -458,7 +458,8 @@
   return circ;
 }
 
-/** Return a new list of all circuits that have <b>conn</b> as n_conn or p_conn.
+/** Return a new list of all circuits that have <b>conn</b> as n_conn or
+ * p_conn, including those marked for close.
  */
 smartlist_t *
 circuit_get_all_on_orconn(connection_t *conn)
@@ -467,8 +468,7 @@
   circuit_t *circ;
 
   for (circ=global_circuitlist;circ;circ = circ->next) {
-    if (!circ->marked_for_close &&
-        (circ->p_conn == conn || circ->n_conn == conn))
+    if (circ->p_conn == conn || circ->n_conn == conn)
       smartlist_add(res, circ);
   }
   return res;