colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

policy: react to firewall/metered changes on UPDATED_BY_USER signal

Browse Source 
Subscribe to the UPDATED_BY_USER signal (instead of UPDATED) to listen
for changes to the firewall zone and metered properties of a
connection since these modifications are supposed to come from user
intervention.
This commit is contained in:
Beniamino Galvani
2015-09-07 14:17:39 +02:00
parent d910c94beb
commit 2562a993c4
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nm-policy.c
View File

@@ -1647,6 +1647,14 @@ static void
connection_updated (NMSettings *settings, connection_updated (NMSettings *settings,
NMConnection *connection, NMConnection *connection,
gpointer user_data) gpointer user_data)
{
schedule_activate_all ((NMPolicy *) user_data);
}
static void
connection_updated_by_user (NMSettings *settings,
NMSettingsConnection *connection,
gpointer user_data)
{ {
NMPolicy *policy = (NMPolicy *) user_data; NMPolicy *policy = (NMPolicy *) user_data;
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy);
@@ -1657,25 +1665,16 @@ connection_updated (NMSettings *settings,
for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) { for (iter = nm_manager_get_devices (priv->manager); iter; iter = g_slist_next (iter)) {
NMDevice *dev = NM_DEVICE (iter->data); NMDevice *dev = NM_DEVICE (iter->data);
if (nm_device_get_connection (dev) == connection) { if (nm_device_get_connection (dev) == NM_CONNECTION (connection)) {
device = dev; device = dev;
break; break;
} }
} }
if (device) { if (device) {
firewall_update_zone (policy, connection, device); firewall_update_zone (policy, NM_CONNECTION (connection), device);
nm_device_update_metered (device); nm_device_update_metered (device);
} }
schedule_activate_all (policy);
}
static void
connection_updated_by_user (NMSettings *settings,
NMSettingsConnection *connection,
gpointer user_data)
{
/* Reset auto retries back to default since connection was updated */ /* Reset auto retries back to default since connection was updated */
nm_settings_connection_reset_autoconnect_retries (connection); nm_settings_connection_reset_autoconnect_retries (connection);
} }