diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/or/config.c | 5 | ||||
-rw-r--r-- | src/or/connection.c | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 23a63ccd2..b5827bee6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1179,10 +1179,13 @@ options_act_reversible(const or_options_t *old_options, char **msg) SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn, { + int marked = conn->marked_for_close; log_notice(LD_NET, "Closing old %s on %s:%d", conn_type_to_string(conn->type), conn->address, conn->port); connection_close_immediate(conn); - connection_mark_for_close(conn); + if (!marked) { + connection_mark_for_close(conn); + } }); goto done; 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; |