mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-15 07:48:11 +02:00
dns: Clear update_pending flag of dns-mgr on update timeout
Even if the first dns update times out, allow the next one 5 seconds to be finished again.
This commit is contained in:
parent
3c01edf937
commit
a1fae0286a
1 changed files with 3 additions and 1 deletions
|
|
@ -191,6 +191,9 @@ _update_pending_unblock_cb(gpointer user_data)
|
|||
_LOGW(
|
||||
"update-pending changed: DNS plugin did not become ready again. Assume something is wrong");
|
||||
|
||||
/* If previous update left this field as TRUE and we have to clear it, so the next
|
||||
* update is again allowed the 5 seconds timeout */
|
||||
priv->update_pending = FALSE;
|
||||
_notify(self, PROP_UPDATE_PENDING);
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
|
|
@ -232,7 +235,6 @@ nm_dns_manager_get_update_pending(NMDnsManager *self)
|
|||
g_return_val_if_fail(NM_IS_DNS_MANAGER(self), FALSE);
|
||||
|
||||
priv = NM_DNS_MANAGER_GET_PRIVATE(self);
|
||||
nm_assert(priv->update_pending == _update_pending_detect(self));
|
||||
nm_assert(priv->update_pending || !priv->update_pending_unblock);
|
||||
|
||||
/* update-pending can only be TRUE for a certain time (before we assume
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue