From bfe522304da217296e2a61040f58e35ec5d6f3f2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 16 Aug 2021 09:51:46 +0200 Subject: New upstream version 1.30.6 --- src/core/nm-policy.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/core/nm-policy.c') diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index db4983f8..71aa1ece 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -652,6 +652,7 @@ device_hostname_info_compare(gconstpointer a, gconstpointer b) NM_CMP_FIELD(info1, info2, priority); NM_CMP_FIELD_UNSAFE(info2, info1, is_default); + NM_CMP_FIELD_UNSAFE(info2, info1, IS_IPv4); return 0; } -- cgit 1.3.0-6-gf8a5 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-policy.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) (limited to 'src/core/nm-policy.c') diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 71aa1ece..e147e504 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -17,14 +17,14 @@ #include "devices/nm-device.h" #include "nm-setting-ip4-config.h" #include "nm-setting-connection.h" -#include "platform/nm-platform.h" +#include "libnm-platform/nm-platform.h" #include "dns/nm-dns-manager.h" #include "vpn/nm-vpn-manager.h" #include "nm-auth-utils.h" -#include "nm-firewall-manager.h" +#include "nm-firewalld-manager.h" #include "nm-dispatcher.h" #include "nm-utils.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-manager.h" #include "settings/nm-settings.h" #include "settings/nm-settings-connection.h" @@ -45,10 +45,10 @@ NM_GOBJECT_PROPERTIES_DEFINE(NMPolicy, PROP_ACTIVATING_IP6_AC, ); typedef struct { - NMManager * manager; - NMNetns * netns; - NMFirewallManager *firewall_manager; - CList pending_activation_checks; + NMManager * manager; + NMNetns * netns; + NMFirewalldManager *firewalld_manager; + CList pending_activation_checks; NMAgentManager *agent_mgr; @@ -2004,19 +2004,12 @@ device_state_changed(NMDevice * device, nm_settings_connection_get_id(sett_conn)); } } - - nm_settings_connection_clear_secrets(sett_conn, FALSE, FALSE); } break; case NM_DEVICE_STATE_ACTIVATED: if (sett_conn) { /* Reset auto retries back to default since connection was successful */ nm_settings_connection_autoconnect_retries_reset(sett_conn); - - /* And clear secrets so they will always be requested from the - * settings service when the next connection is made. - */ - nm_settings_connection_clear_secrets(sett_conn, FALSE, FALSE); } /* Add device's new IPv4 and IPv6 configs to DNS */ @@ -2526,21 +2519,22 @@ connection_added(NMSettings *settings, NMSettingsConnection *connection, gpointe } static void -firewall_state_changed(NMFirewallManager *manager, gboolean initialized_now, gpointer user_data) +firewall_state_changed(NMFirewalldManager *manager, int signal_type_i, gpointer user_data) { - NMPolicy * self = (NMPolicy *) user_data; - NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); - const CList * tmp_lst; - NMDevice * device; + const NMFirewalldManagerStateChangedType signal_type = signal_type_i; + NMPolicy * self = user_data; + NMPolicyPrivate * priv = NM_POLICY_GET_PRIVATE(self); + const CList * tmp_lst; + NMDevice * device; - if (initialized_now) { + if (signal_type == NM_FIREWALLD_MANAGER_STATE_CHANGED_TYPE_INITIALIZED) { /* the firewall manager was initializing, but all requests * so fare were queued and are already sent. No need to * re-update the firewall zone of the devices. */ return; } - if (!nm_firewall_manager_get_running(manager)) + if (!nm_firewalld_manager_get_running(manager)) return; /* add interface of each device to correct zone */ @@ -2792,9 +2786,9 @@ constructed(GObject *object) priv->agent_mgr = g_object_ref(nm_agent_manager_get()); - priv->firewall_manager = g_object_ref(nm_firewall_manager_get()); - g_signal_connect(priv->firewall_manager, - NM_FIREWALL_MANAGER_STATE_CHANGED, + priv->firewalld_manager = g_object_ref(nm_firewalld_manager_get()); + g_signal_connect(priv->firewalld_manager, + NM_FIREWALLD_MANAGER_STATE_CHANGED, G_CALLBACK(firewall_state_changed), self); @@ -2897,9 +2891,9 @@ dispose(GObject *object) g_slist_free_full(priv->pending_secondaries, (GDestroyNotify) pending_secondary_data_free); priv->pending_secondaries = NULL; - if (priv->firewall_manager) { - g_signal_handlers_disconnect_by_func(priv->firewall_manager, firewall_state_changed, self); - g_clear_object(&priv->firewall_manager); + if (priv->firewalld_manager) { + g_signal_handlers_disconnect_by_func(priv->firewalld_manager, firewall_state_changed, self); + g_clear_object(&priv->firewalld_manager); } if (priv->agent_mgr) { -- 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-policy.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'src/core/nm-policy.c') diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index e147e504..03e082f1 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -322,7 +322,9 @@ ip6_remove_device_prefix_delegations(NMPolicy *self, NMDevice *device) } static void -device_ip6_prefix_delegated(NMDevice *device, NMPlatformIP6Address *prefix, gpointer user_data) +device_ip6_prefix_delegated(NMDevice * device, + const NMPlatformIP6Address *prefix, + gpointer user_data) { NMPolicyPrivate * priv = user_data; NMPolicy * self = _PRIV_TO_SELF(priv); @@ -913,7 +915,7 @@ update_system_hostname(NMPolicy *self, const char *msg) if (wait) { g_signal_connect(info->device, NM_DEVICE_DNS_LOOKUP_DONE, - (GCallback) device_dns_lookup_done, + G_CALLBACK(device_dns_lookup_done), self); return; } @@ -2057,7 +2059,7 @@ device_state_changed(NMDevice * device, _LOGD(LOGD_DEVICE, "blocking autoconnect of connection '%s': %s", nm_settings_connection_get_id(sett_conn), - NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_str, + NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_string, nm_device_state_reason_check(reason))); nm_settings_connection_autoconnect_blocked_reason_set(sett_conn, blocked_reason, @@ -2141,6 +2143,7 @@ device_ip_config_changed(NMDevice * device, NMPolicyPrivate *priv = user_data; NMPolicy * self = _PRIV_TO_SELF(priv); int addr_family; + NMDeviceState state; nm_assert(new_config || old_config); nm_assert(!new_config || NM_IS_IP_CONFIG(new_config)); @@ -2159,7 +2162,8 @@ device_ip_config_changed(NMDevice * device, * ignore IP config changes but when the device is in activated state. * Prevents unnecessary changes to DNS information. */ - if (nm_device_get_state(device) == NM_DEVICE_STATE_ACTIVATED) { + state = nm_device_get_state(device); + if (state > NM_DEVICE_STATE_IP_CONFIG && state <= NM_DEVICE_STATE_ACTIVATED) { if (old_config != new_config) { if (new_config) _dns_manager_set_ip_config(priv->dns_manager, @@ -2222,30 +2226,30 @@ devices_list_register(NMPolicy *self, NMDevice *device) NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE(self); /* Connect state-changed with _after, so that the handler is invoked after other handlers. */ - g_signal_connect_after(device, NM_DEVICE_STATE_CHANGED, (GCallback) device_state_changed, priv); + g_signal_connect_after(device, NM_DEVICE_STATE_CHANGED, G_CALLBACK(device_state_changed), priv); g_signal_connect(device, NM_DEVICE_IP4_CONFIG_CHANGED, - (GCallback) device_ip_config_changed, + G_CALLBACK(device_ip_config_changed), priv); g_signal_connect(device, NM_DEVICE_IP6_CONFIG_CHANGED, - (GCallback) device_ip_config_changed, + G_CALLBACK(device_ip_config_changed), priv); g_signal_connect(device, NM_DEVICE_IP6_PREFIX_DELEGATED, - (GCallback) device_ip6_prefix_delegated, + G_CALLBACK(device_ip6_prefix_delegated), priv); g_signal_connect(device, NM_DEVICE_IP6_SUBNET_NEEDED, - (GCallback) device_ip6_subnet_needed, + G_CALLBACK(device_ip6_subnet_needed), priv); g_signal_connect(device, "notify::" NM_DEVICE_AUTOCONNECT, - (GCallback) device_autoconnect_changed, + G_CALLBACK(device_autoconnect_changed), priv); g_signal_connect(device, NM_DEVICE_RECHECK_AUTO_ACTIVATE, - (GCallback) device_recheck_auto_activate, + G_CALLBACK(device_recheck_auto_activate), priv); } @@ -2801,49 +2805,49 @@ constructed(GObject *object) g_signal_connect(priv->hostname_manager, "notify::" NM_HOSTNAME_MANAGER_HOSTNAME, - (GCallback) hostname_changed, + G_CALLBACK(hostname_changed), priv); g_signal_connect(priv->manager, "notify::" NM_MANAGER_SLEEPING, - (GCallback) sleeping_changed, + G_CALLBACK(sleeping_changed), priv); g_signal_connect(priv->manager, "notify::" NM_MANAGER_NETWORKING_ENABLED, - (GCallback) sleeping_changed, + G_CALLBACK(sleeping_changed), priv); g_signal_connect(priv->manager, NM_MANAGER_INTERNAL_DEVICE_ADDED, - (GCallback) device_added, + G_CALLBACK(device_added), priv); g_signal_connect(priv->manager, NM_MANAGER_INTERNAL_DEVICE_REMOVED, - (GCallback) device_removed, + G_CALLBACK(device_removed), priv); g_signal_connect(priv->manager, NM_MANAGER_ACTIVE_CONNECTION_ADDED, - (GCallback) active_connection_added, + G_CALLBACK(active_connection_added), priv); g_signal_connect(priv->manager, NM_MANAGER_ACTIVE_CONNECTION_REMOVED, - (GCallback) active_connection_removed, + G_CALLBACK(active_connection_removed), priv); g_signal_connect(priv->settings, NM_SETTINGS_SIGNAL_CONNECTION_ADDED, - (GCallback) connection_added, + G_CALLBACK(connection_added), priv); g_signal_connect(priv->settings, NM_SETTINGS_SIGNAL_CONNECTION_UPDATED, - (GCallback) connection_updated, + G_CALLBACK(connection_updated), priv); g_signal_connect(priv->settings, NM_SETTINGS_SIGNAL_CONNECTION_REMOVED, - (GCallback) connection_removed, + G_CALLBACK(connection_removed), priv); g_signal_connect(priv->settings, NM_SETTINGS_SIGNAL_CONNECTION_FLAGS_CHANGED, - (GCallback) connection_flags_changed, + G_CALLBACK(connection_flags_changed), priv); g_signal_connect(priv->agent_mgr, -- cgit 1.3.0-6-gf8a5