diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-12-05 19:26:09 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-12-05 19:26:09 +0000 |
| commit | fedc9c8a605b07d2c1e1c2e8b08f80c1051dbf47 (patch) | |
| tree | 515e3661698ac0fa454c2a058f0983f04fcf345b /src/or/circuitlist.c | |
| parent | b03e8733f35b8a61cb0c7d5c68b5532db2b796a8 (diff) | |
| download | tor-fedc9c8a605b07d2c1e1c2e8b08f80c1051dbf47.tar tor-fedc9c8a605b07d2c1e1c2e8b08f80c1051dbf47.tar.gz | |
We were neglecting to unlink marked circuits from soon-to-close OR connections.
svn:r5510
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 6d1d61f00..c9db1e9da 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 <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_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; |