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

This commit is contained in:
Andrea Shepard 2014-04-15 20:35:31 -07:00
parent a5544e589d
commit f36e93206a

View File

@ -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;