diff options
| author | Michael Biebl <biebl@debian.org> | 2021-10-01 23:05:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2021-10-01 23:05:04 +0200 |
| commit | e74c568b07b50b97873fb4ee1d776dedefbd54d6 (patch) | |
| tree | 3469f17ea9af91f7ff169b890633bda68b0cf76e /src/core/nm-connectivity.c | |
| parent | bfe522304da217296e2a61040f58e35ec5d6f3f2 (diff) | |
New upstream version 1.32.12 upstream/1.32.12
Diffstat (limited to 'src/core/nm-connectivity.c')
| -rw-r--r-- | src/core/nm-connectivity.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index f847c8f4..85d41b49 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -16,7 +16,7 @@ #include <glib-unix.h> #include "c-list/src/c-list.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-config.h" #include "NetworkManagerUtils.h" #include "nm-dbus-manager.h" @@ -572,7 +572,7 @@ easy_write_cb(void *buffer, size_t size, size_t nmemb, void *userdata) * Continue receiving... */ cb_data->concheck.response_good_cnt += len; - if (cb_data->concheck.response_good_cnt > (gsize)(100 * 1024)) { + if (cb_data->concheck.response_good_cnt > (gsize) (100 * 1024)) { /* we expect an empty response. We accept either * 1) status code 204 and any response * 2) status code 200 and an empty response. @@ -764,7 +764,7 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data) } #endif -#define SD_RESOLVED_DNS ((guint64)(1LL << 0)) +#define SD_RESOLVED_DNS ((guint64) (1LL << 0)) static NMConnectivityState check_platform_config(NMConnectivity *self, @@ -904,7 +904,7 @@ nm_connectivity_check_start(NMConnectivity * self, * This is relatively cumbersome to avoid, because we would have to go through * NMDnsSystemdResolved trying to asynchronously start the service, to ensure there * is only one attempt to start the service. */ - has_systemd_resolved = nm_dns_manager_has_systemd_resolved(nm_dns_manager_get()); + has_systemd_resolved = !!nm_dns_manager_get_systemd_resolved(nm_dns_manager_get()); if (has_systemd_resolved) { GDBusConnection *dbus_connection; |