fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-26 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: fix wrongly deleting default-route on exit

Browse source 
We must preserve the default-route on shutdown.

Thus it must first be announced as "assumed", and only removed
in a second step.

Fixes: 9498ea507e
(cherry picked from commit 2079f8361c)
This commit is contained in:
Thomas Haller 2016-04-15 17:01:02 +02:00
parent 8e405e99f0
commit 9c9dc9727a
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2591,11 +2591,20 @@ nm_device_removed (NMDevice *self)
* is reacting via NM_DEVICE_IP4_CONFIG_CHANGED/NM_DEVICE_IP6_CONFIG_CHANGED
* signal. As NMPolicy registered the NMIPxConfig instances in NMDnsManager,
* these would be leaked otherwise. */
if ( priv->default_route.v4_has
&& !priv->default_route.v4_is_assumed) {
priv->default_route.v4_is_assumed = TRUE;
nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self);
}
if ( priv->default_route.v6_has
&& !priv->default_route.v6_is_assumed) {
priv->default_route.v6_is_assumed = TRUE;
nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self);
}
priv->default_route.v4_has = FALSE;
priv->default_route.v4_is_assumed = TRUE;
nm_device_set_ip4_config (self, NULL, 0, FALSE, FALSE, NULL);
priv->default_route.v6_has = FALSE;
priv->default_route.v6_is_assumed = TRUE;
nm_device_set_ip6_config (self, NULL, FALSE, FALSE, NULL);
}