Browse Source

Avoid redundant calls to connection_mark_for_close() on listeners when setting DisableNetwork to 1

Andrea Shepard 11 years ago
parent
commit
f36e93206a
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/or/config.c

+ 4 - 1
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;