From 25a2991332bb5084db51de533b2593b35d49610c Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 8 Sep 2023 22:15:56 +0200 Subject: [PATCH] l3cfg: log the reason when marking IP configuration dirty --- src/core/nm-l3cfg.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c index 6beeafb9d6..1e54f39677 100644 --- a/src/core/nm-l3cfg.c +++ b/src/core/nm-l3cfg.c @@ -675,9 +675,9 @@ _nm_l3cfg_emit_signal_notify_l3cd_changed(NML3Cfg *self, /*****************************************************************************/ static void -_l3_changed_configs_set_dirty(NML3Cfg *self) +_l3_changed_configs_set_dirty(NML3Cfg *self, const char *reason) { - _LOGT("IP configuration changed (mark dirty)"); + _LOGT("IP configuration changed (mark dirty): %s", reason); self->priv.p->changed_configs_configs = TRUE; self->priv.p->changed_configs_acd_state = TRUE; } @@ -1794,7 +1794,7 @@ _l3_acd_nacd_instance_ensure_retry_cb(gpointer user_data) nm_clear_g_source_inst(&self->priv.p->nacd_instance_ensure_retry); - _l3_changed_configs_set_dirty(self); + _l3_changed_configs_set_dirty(self, "nacd retry"); nm_l3cfg_commit(self, NM_L3_CFG_COMMIT_TYPE_AUTO); return G_SOURCE_REMOVE; } @@ -1817,7 +1817,7 @@ _l3_acd_nacd_instance_reset(NML3Cfg *self, NMTernary start_timer, gboolean acd_d switch (start_timer) { case NM_TERNARY_FALSE: - _l3_changed_configs_set_dirty(self); + _l3_changed_configs_set_dirty(self, "nacd reset"); nm_l3cfg_commit_on_idle_schedule(self, NM_L3_CFG_COMMIT_TYPE_AUTO); break; case NM_TERNARY_TRUE: @@ -2332,7 +2332,7 @@ _nm_printf(5, 6) static void _l3_acd_data_state_set_full(NML3Cfg *self, if (changed && allow_commit) { /* The availability of an address just changed (and we are instructed to * trigger a new commit). Do it. */ - _l3_changed_configs_set_dirty(self); + _l3_changed_configs_set_dirty(self, "acd state changed"); nm_l3cfg_commit_on_idle_schedule(self, NM_L3_CFG_COMMIT_TYPE_AUTO); } } @@ -3560,7 +3560,7 @@ nm_l3cfg_add_config(NML3Cfg *self, nm_assert(l3_config_data->acd_defend_type_confdata == acd_defend_type); if (changed) { - _l3_changed_configs_set_dirty(self); + _l3_changed_configs_set_dirty(self, "configuration added"); nm_l3cfg_commit_on_idle_schedule(self, NM_L3_CFG_COMMIT_TYPE_AUTO); } @@ -3597,7 +3597,7 @@ _l3cfg_remove_config(NML3Cfg *self, continue; } - _l3_changed_configs_set_dirty(self); + _l3_changed_configs_set_dirty(self, "configuration removed"); _l3_config_datas_remove_index_fast(self->priv.p->l3_config_datas, idx); changed = TRUE; if (l3cd) { @@ -4979,7 +4979,6 @@ _l3_commit(NML3Cfg *self, NML3CfgCommitType commit_type, gboolean is_idle) gboolean changed_combined_l3cd; gboolean do_prune_acd_data; - g_return_if_fail(NM_IS_L3CFG(self)); nm_assert(NM_IN_SET(commit_type, NM_L3_CFG_COMMIT_TYPE_NONE,