aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2013-09-23 09:37:26 -0700
committerNick Mathewson <nickm@torproject.org>2013-09-24 10:42:12 -0400
commit938ee9b24dfda03a68a71d43b88e9fb00a90f9c8 (patch)
tree4a866ec40c960ec5f40a9aee709d66fd409f75ed /src/or/connection_or.c
parent116e6af7a7024b4731ce6af75e8c5c5167314048 (diff)
downloadtor-938ee9b24dfda03a68a71d43b88e9fb00a90f9c8.tar
tor-938ee9b24dfda03a68a71d43b88e9fb00a90f9c8.tar.gz
Always call circuit_n_chan_done(chan, 0) from channel_closed()
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 0e9d06a72..3d16e1453 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -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