Avoid redundant calls to connection_mark_for_close() on listeners when setting Disabl...

diff --git a/src/or/config.c b/src/or/config.c
index ca99d014fc208ec82638e7d838c9b32ebb5986da..3089c6f51b4bcf96d0a38c7805d42cfc253caf6d 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1178,10 +1178,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;