fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-15 02:10:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns/resolved: add ensure_resolved_running() helper method

Browse source 
Factor out the code. We will use it next.
This commit is contained in:
Thomas Haller 2021-04-23 16:44:34 +02:00
parent 42938a7f52
commit 92f742f66b
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/core/dns/nm-dns-systemd-resolved.c
View file

@ -323,20 +323,14 @@ prepare_one_interface(NMDnsSystemdResolved *self, InterfaceConfig *ic)
return has_config;
}
static void
send_updates(NMDnsSystemdResolved *self)
static NMTernary
ensure_resolved_running(NMDnsSystemdResolved *self)
{
NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(self);
RequestItem * request_item;
if (!priv->request_queue_to_send) {
/* nothing to do. */
return;
}
if (!priv->dbus_initied) {
_LOGT("send-updates: D-Bus connection not ready");
return;
return NM_TERNARY_DEFAULT;
}
if (!priv->dbus_has_owner) {
@ -344,7 +338,7 @@ send_updates(NMDnsSystemdResolved *self)
/* we have no name owner and we already tried poking the service to
* autostart. */
_LOGT("send-updates: no name owner");
return;
return NM_TERNARY_FALSE;
}
_LOGT("send-updates: no name owner. Try start service...");
@ -356,9 +350,26 @@ send_updates(NMDnsSystemdResolved *self)
NULL,
NULL,
NULL);
return NM_TERNARY_DEFAULT;
}
return NM_TERNARY_TRUE;
}
static void
send_updates(NMDnsSystemdResolved *self)
{
NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(self);
RequestItem * request_item;
if (!priv->request_queue_to_send) {
/* nothing to do. */
return;
}
if (ensure_resolved_running(self) != NM_TERNARY_TRUE)
return;
nm_clear_g_cancellable(&priv->cancellable);
if (c_list_is_empty(&priv->request_queue_lst_head)) {