From fedc9c8a605b07d2c1e1c2e8b08f80c1051dbf47 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 5 Dec 2005 19:26:09 +0000 Subject: [PATCH] We were neglecting to unlink marked circuits from soon-to-close OR connections. svn:r5510 --- src/or/circuitlist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 6d1d61f00e..c9db1e9da2 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -458,7 +458,8 @@ circuit_get_by_edge_conn(connection_t *conn) return circ; } -/** Return a new list of all circuits that have conn as n_conn or p_conn. +/** Return a new list of all circuits that have conn 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_get_all_on_orconn(connection_t *conn) 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;