From 938ee9b24dfda03a68a71d43b88e9fb00a90f9c8 Mon Sep 17 00:00:00 2001 From: Andrea Shepard Date: Mon, 23 Sep 2013 09:37:26 -0700 Subject: Always call circuit_n_chan_done(chan, 0) from channel_closed() --- src/or/channel.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/or/channel.c') diff --git a/src/or/channel.c b/src/or/channel.c index 602797d0dc..1fb39b88ca 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1292,11 +1292,10 @@ channel_closed(channel_t *chan) if (chan->state == CHANNEL_STATE_CLOSED || chan->state == CHANNEL_STATE_ERROR) return; - if (chan->reason_for_closing == CHANNEL_CLOSE_FOR_ERROR) { - /* Inform any pending (not attached) circs that they should - * give up. */ - circuit_n_chan_done(chan, 0); - } + /* Inform any pending (not attached) circs that they should + * give up. */ + circuit_n_chan_done(chan, 0); + /* Now close all the attached circuits on it. */ circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED); -- cgit v1.2.3-54-g00ecf