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

dns: minor cleanup of call_done() in "nm-dns-systemd-resolved.c"

Browse source
This commit is contained in:
Thomas Haller 2020-11-26 13:45:44 +01:00
parent 8af6647cda
commit 42d47d1cd7
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/dns/nm-dns-systemd-resolved.c
View file

@ -131,22 +131,37 @@ call_done(GObject *source, GAsyncResult *r, gpointer user_data)
gs_free_error GError * error = NULL;
NMDnsSystemdResolved * self;
NMDnsSystemdResolvedPrivate *priv;
RequestItem * request_item;
NMLogLevel log_level;
v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), r, &error);
if (nm_utils_error_is_cancelled(error))
return;
goto out;
self = user_data;
priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(self);
request_item = user_data;
self = request_item->self;
priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(self);
if (!v) {
if (!priv->send_updates_warn_ratelimited) {
priv->send_updates_warn_ratelimited = TRUE;
_LOGW("send-updates failed to update systemd-resolved: %s", error->message);
} else
_LOGD("send-updates failed: %s", error->message);
} else
if (v) {
priv->send_updates_warn_ratelimited = FALSE;
goto out;
}
log_level = LOGL_DEBUG;
if (!priv->send_updates_warn_ratelimited) {
priv->send_updates_warn_ratelimited = TRUE;
log_level = LOGL_WARN;
}
_NMLOG(log_level,
"send-updates %s@%d failed: %s",
request_item->operation,
request_item->ifindex,
error->message);
out:
_request_item_free(request_item);
}
static gboolean
@ -364,8 +379,8 @@ send_updates(NMDnsSystemdResolved *self)
-1,
priv->cancellable,
call_done,
self);
_request_item_free(request_item);
request_item);
c_list_unlink(&request_item->request_queue_lst);
}
}