Commit 938ee9b2 authored Sep 23, 2013 by Andrea Shepard Committed by Nick Mathewson Sep 24, 2013

Always call circuit_n_chan_done(chan, 0) from channel_closed()

parent 116e6af7

changes/bug9776

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		o Normal bugfixes:
		- Always call circuit_n_chan_done(chan, 0) from channel_closed(), so we
		can't leak pending circuits in some cases where
		run_connection_housekeeping() calls connection_or_close_normally().
		Fixes bug #9776; bugfix on 0.2.4.17.

src/or/channel.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/* Now close all the attached circuits on it. */
		circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED);

src/or/connection_or.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1160,6 +1160,16 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,

		/** Mark orconn for close and transition the associated channel, if any, to
		* the closing state.
		*
		* It's safe to call this and connection_or_close_for_error() any time, and
		* channel layer will treat it as a connection closing for reasons outside
		* its control, like the remote end closing it. It can also be a local
		* reason that's specific to connection_t/or_connection_t rather than
		* the channel mechanism, such as expiration of old connections in
		* run_connection_housekeeping(). If you want to close a channel_t
		* from somewhere that logically works in terms of generic channels
		* rather than connections, use channel_mark_for_close(); see also
		* the comment on that function in channel.c.
		*/

		void