From a5544e589d1724fc2765b277da736bbb2a9a8299 Mon Sep 17 00:00:00 2001 From: Andrea Shepard Date: Tue, 15 Apr 2014 20:19:39 -0700 Subject: Close orconns correctly through channels when setting DisableNetwork to 1 --- src/or/connection.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/or/connection.c b/src/or/connection.c index 1be4c45dd..0c61b0d61 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2359,6 +2359,20 @@ connection_mark_all_noncontrol_connections(void) connection_mark_unattached_ap(TO_ENTRY_CONN(conn), END_STREAM_REASON_HIBERNATING); break; + case CONN_TYPE_OR: + { + or_connection_t *orconn = TO_OR_CONN(conn); + if (orconn->chan) { + connection_or_close_normally(orconn, 0); + } else { + /* + * There should have been one, but mark for close and hope + * for the best.. + */ + connection_mark_for_close(conn); + } + } + break; default: connection_mark_for_close(conn); break; -- cgit v1.2.3