From e74c568b07b50b97873fb4ee1d776dedefbd54d6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 1 Oct 2021 23:05:04 +0200 Subject: New upstream version 1.32.12 --- src/core/nm-connectivity.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/nm-connectivity.c') 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 #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; -- cgit 1.3.0-6-gf8a5 From 88c227d90a6b7b388c5c85d72802a0ca8f05ed5c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 13 Jan 2022 22:30:39 +0100 Subject: New upstream version 1.34.0 --- src/core/nm-connectivity.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/core/nm-connectivity.c') diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index 85d41b49..13fb0265 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -10,10 +10,9 @@ #include "nm-connectivity.h" #if WITH_CONCHECK - #include +#include #endif #include -#include #include "c-list/src/c-list.h" #include "libnm-core-intern/nm-core-internal.h" @@ -509,15 +508,8 @@ multi_socket_cb(CURL *e_handle, curl_socket_t fd, int what, void *userdata, void else condition = 0; - if (condition) { - fdp->source = nm_g_unix_fd_source_new(fd, - condition, - G_PRIORITY_DEFAULT, - _con_curl_socketevent_cb, - fdp, - NULL); - g_source_attach(fdp->source, NULL); - } + if (condition) + fdp->source = nm_g_unix_fd_add_source(fd, condition, _con_curl_socketevent_cb, fdp); } return CURLM_OK; -- cgit 1.3.0-6-gf8a5