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

devices: update generated connections when the underlying IP config changes

Browse source 
If the IP config changes on a device that has assumed a generated
connection, then update the connection's NMSettingIP4Config /
NMSettingIP6Config, under the assumption that the configuration of
that device was in progress but incomplete when NM first observed it.
This commit is contained in:
Dan Winship 2014-05-27 16:42:19 -04:00
parent 14048089a1
commit a9a25973cc
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/devices/nm-device.c
View file

@ -855,6 +855,17 @@ nm_device_get_type_desc (NMDevice *self)
return NM_DEVICE_GET_PRIVATE (self)->type_desc;
}
static gboolean
nm_device_uses_generated_connection (NMDevice *self)
{
NMConnection *connection;
connection = nm_device_get_connection (self);
if (!connection)
return FALSE;
return nm_settings_connection_get_nm_generated (NM_SETTINGS_CONNECTION (connection));
}
static SlaveInfo *
find_slave_info (NMDevice *self, NMDevice *slave)
{
@ -5221,6 +5232,17 @@ nm_device_set_ip4_config (NMDevice *self,
if (old_config != priv->ip4_config && old_config)
g_object_unref (old_config);
if (nm_device_uses_generated_connection (self)) {
NMConnection *connection = nm_device_get_connection (self);
NMSetting *s_ip4;
g_object_freeze_notify (G_OBJECT (connection));
nm_connection_remove_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
s_ip4 = nm_ip4_config_create_setting (priv->ip4_config);
nm_connection_add_setting (connection, s_ip4);
g_object_thaw_notify (G_OBJECT (connection));
}
}
if (reason)
@ -5312,6 +5334,17 @@ nm_device_set_ip6_config (NMDevice *self,
if (old_config != priv->ip6_config && old_config)
g_object_unref (old_config);
if (nm_device_uses_generated_connection (self)) {
NMConnection *connection = nm_device_get_connection (self);
NMSetting *s_ip6;
g_object_freeze_notify (G_OBJECT (connection));
nm_connection_remove_setting (connection, NM_TYPE_SETTING_IP6_CONFIG);
s_ip6 = nm_ip6_config_create_setting (priv->ip6_config);
nm_connection_add_setting (connection, s_ip6);
g_object_thaw_notify (G_OBJECT (connection));
}
}
if (reason)