colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dns: Refactor changing of Dnsconfd plugin state

Browse Source
This commit is contained in:
Tomas Korbar
2025-03-13 12:34:09 +01:00
committed by Beniamino Galvani
parent 4ad20787bb
commit 7ba27f7a13
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/dns/nm-dns-dnsconfd.c
View File

@@ -71,6 +71,15 @@ typedef enum {
/*****************************************************************************/ /*****************************************************************************/
static void
dnsconfd_change_plugin_state(NMDnsDnsconfd *self, DnsconfdPluginState new_state)
{
NMDnsDnsconfdPrivate *priv = NM_DNS_DNSCONFD_GET_PRIVATE(self);
priv->plugin_state = new_state;
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
}
static void static void
dnsconfd_serial_changed(NMDnsDnsconfd *self, guint new_serial) dnsconfd_serial_changed(NMDnsDnsconfd *self, guint new_serial)
{ {
@@ -78,12 +87,10 @@ dnsconfd_serial_changed(NMDnsDnsconfd *self, guint new_serial)
priv->present_configuration_serial = new_serial; priv->present_configuration_serial = new_serial;
if (priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL if (priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL
&& priv->awaited_configuration_serial == new_serial) { && priv->awaited_configuration_serial == new_serial) {
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
/* Update finished, serials match */ /* Update finished, serials match */
_LOGT("serials match, update finished"); _LOGT("serials match, update finished");
} }
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
} }
static void static void
@@ -134,8 +141,7 @@ dnsconfd_serial_retrieval_done(GObject *source_object, GAsyncResult *res, gpoint
if (!response) { if (!response) {
_LOGW("dnsconfd serial retrieval failed: %s", error->message); _LOGW("dnsconfd serial retrieval failed: %s", error->message);
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
return; return;
} }
@@ -210,8 +216,7 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
if (!response) { if (!response) {
_LOGW("dnsconfd update failed: %s", error->message); _LOGW("dnsconfd update failed: %s", error->message);
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
return; return;
} }
@@ -221,8 +226,7 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
if (!awaited_serial) { if (!awaited_serial) {
_LOGW("dnsconfd refused update: %s", dnsconfd_message); _LOGW("dnsconfd refused update: %s", dnsconfd_message);
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
return; return;
} }
@@ -231,14 +235,12 @@ dnsconfd_update_done(GObject *source_object, GAsyncResult *res, gpointer user_da
if (priv->awaited_configuration_serial == priv->present_configuration_serial) { if (priv->awaited_configuration_serial == priv->present_configuration_serial) {
/* Serials match, update finished */ /* Serials match, update finished */
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
_LOGT("after update serials match"); _LOGT("after update serials match");
} else { } else {
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_SERIAL; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_SERIAL);
_LOGT("after update serials don't match, waiting"); _LOGT("after update serials don't match, waiting");
} }
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
} }
static gboolean static gboolean
@@ -489,8 +491,7 @@ name_owner_changed(NMDnsDnsconfd *self, const char *name_owner)
|| priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL) { || priv->plugin_state == DNSCONFD_PLUGIN_WAIT_SERIAL) {
/* We were waiting for either serial or confirmation of update and name /* We were waiting for either serial or confirmation of update and name
* disappeared, thus we need to retransmit */ * disappeared, thus we need to retransmit */
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
} }
return; return;
} }
@@ -501,15 +502,13 @@ name_owner_changed(NMDnsDnsconfd *self, const char *name_owner)
if (!subscribe_serial(self)) { if (!subscribe_serial(self)) {
/* This means that in time between new name and subscribe serial call /* This means that in time between new name and subscribe serial call
* we lost the name again thus wait again */ * we lost the name again thus wait again */
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
_LOGT("subscription failed, waiting to connect"); _LOGT("subscription failed, waiting to connect");
} else { } else {
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_UPDATE_DONE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_UPDATE_DONE);
_LOGT("sending update and waiting for its finish"); _LOGT("sending update and waiting for its finish");
send_dnsconfd_update(self); send_dnsconfd_update(self);
} }
_nm_dns_plugin_update_pending_maybe_changed(NM_DNS_PLUGIN(self));
} }
static void static void
@@ -706,18 +705,16 @@ update(NMDnsPlugin *plugin,
/* We need to consider only whether we are connected, because newer update call /* We need to consider only whether we are connected, because newer update call
* overrides the old one */ * overrides the old one */
if (all_connected == CONNECTION_FAIL) { if (all_connected == CONNECTION_FAIL) {
priv->plugin_state = DNSCONFD_PLUGIN_IDLE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_IDLE);
_LOGT("failed to connect"); _LOGT("failed to connect");
} else if (all_connected == CONNECTION_WAIT) { } else if (all_connected == CONNECTION_WAIT) {
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_CONNECT; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_CONNECT);
_LOGT("not connected, waiting to connect"); _LOGT("not connected, waiting to connect");
} else { } else {
priv->plugin_state = DNSCONFD_PLUGIN_WAIT_UPDATE_DONE; dnsconfd_change_plugin_state(self, DNSCONFD_PLUGIN_WAIT_UPDATE_DONE);
_LOGT("connected, waiting for update to finish"); _LOGT("connected, waiting for update to finish");
} }
_nm_dns_plugin_update_pending_maybe_changed(plugin);
if (all_connected == CONNECTION_FAIL) { if (all_connected == CONNECTION_FAIL) {
nm_utils_error_set(error, nm_utils_error_set(error,
NM_UTILS_ERROR_UNKNOWN, NM_UTILS_ERROR_UNKNOWN,