fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 23:30:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: add "assumed" arg to nm_device_set_ip6_config()

Browse source 
Although the code still does not support assuming IP6 configurations,
add an "assumed" flag to this function, to match
nm_device_set_ip4_config().
This commit is contained in:
Dan Winship 2013-04-12 15:08:49 -04:00
parent c35dda8727
commit f92ce56739
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nm-device.c
View file

@ -284,6 +284,7 @@ static gboolean nm_device_set_ip4_config (NMDevice *dev,
NMDeviceStateReason *reason);
static gboolean nm_device_set_ip6_config (NMDevice *dev,
NMIP6Config *config,
gboolean assumed,
NMDeviceStateReason *reason);
static gboolean nm_device_activate_ip6_config_commit (gpointer user_data);
@ -2516,7 +2517,7 @@ ip6_config_merge_and_apply (NMDevice *self,
/* Merge user overrides into the composite config */
nm_utils_merge_ip6_config (composite, nm_connection_get_setting_ip6_config (connection));
success = nm_device_set_ip6_config (self, composite, out_reason);
success = nm_device_set_ip6_config (self, composite, FALSE, out_reason);
g_object_unref (composite);
return success;
}
@ -4011,7 +4012,7 @@ nm_device_deactivate (NMDevice *self, NMDeviceStateReason reason)
/* Clean up nameservers and addresses */
nm_device_set_ip4_config (self, NULL, FALSE, &ignored);
nm_device_set_ip6_config (self, NULL, &ignored);
nm_device_set_ip6_config (self, NULL, FALSE, &ignored);
}
static void
@ -4242,6 +4243,7 @@ nm_device_set_ip4_config (NMDevice *self,
static gboolean
nm_device_set_ip6_config (NMDevice *self,
NMIP6Config *new_config,
gboolean assumed,
NMDeviceStateReason *reason)
{
NMDevicePrivate *priv;
@ -4272,9 +4274,10 @@ nm_device_set_ip6_config (NMDevice *self,
if (new_config) {
priv->ip6_config = g_object_ref (new_config);
success = nm_system_apply_ip6_config (ip_ifindex, new_config, nm_device_get_priority (self), diff);
if (!assumed)
success = nm_system_apply_ip6_config (ip_ifindex, new_config, nm_device_get_priority (self), diff);
if (success) {
if (success || assumed) {
/* Export over D-Bus */
if (!nm_ip6_config_get_dbus_path (new_config))
nm_ip6_config_export (new_config);