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

core: fix tracking default-route during device's merge and apply

Browse source 
If we don't commit the IP config, we must merge the currently tracked
default route. Otherwise, on every non-commit call of
ip4_config_merge_and_apply(), the default-route gets lost.

Fixes: 77ec302714
This commit is contained in:
Thomas Haller 2017-09-18 09:22:35 +02:00
parent 2cc1813340
commit 289f0f703f
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5582,6 +5582,7 @@ ip4_config_merge_and_apply (NMDevice *self,
GSList *iter;
NMPlatformIP4Route default_route;
gs_unref_ptrarray GPtrArray *ip4_dev_route_blacklist = NULL;
gboolean add_default_route = TRUE;
/* Merge all the configs into the composite config */
if (config) {
@ -5678,6 +5679,8 @@ ip4_config_merge_and_apply (NMDevice *self,
&& nm_device_get_device_type (self) != NM_DEVICE_TYPE_MODEM)
goto END_ADD_DEFAULT_ROUTE;
add_default_route = FALSE;
memset (&default_route, 0, sizeof (default_route));
default_route.rt_source = NM_IP_CONFIG_SOURCE_USER;
default_route.gateway = gateway;
@ -5699,6 +5702,13 @@ ip4_config_merge_and_apply (NMDevice *self,
END_ADD_DEFAULT_ROUTE:
if (add_default_route) {
if (priv->default_route4)
nm_ip4_config_add_route (composite, NMP_OBJECT_CAST_IP4_ROUTE (priv->default_route4), NULL);
if (priv->default_routegw4)
nm_ip4_config_add_route (composite, NMP_OBJECT_CAST_IP4_ROUTE (priv->default_routegw4), NULL);
}
if (commit) {
nm_ip4_config_add_device_routes (composite,
default_route_metric,
@ -6287,6 +6297,7 @@ ip6_config_merge_and_apply (NMDevice *self,
const char *token = NULL;
GSList *iter;
NMPlatformIP6Route default_route;
gboolean add_default_route = TRUE;
/* Apply ignore-auto-routes and ignore-auto-dns settings */
connection = nm_device_get_applied_connection (self);
@ -6407,6 +6418,8 @@ ip6_config_merge_and_apply (NMDevice *self,
if (!gateway)
goto END_ADD_DEFAULT_ROUTE;
add_default_route = FALSE;
memset (&default_route, 0, sizeof (default_route));
default_route.rt_source = NM_IP_CONFIG_SOURCE_USER;
default_route.gateway = *gateway;
@ -6426,6 +6439,14 @@ ip6_config_merge_and_apply (NMDevice *self,
}
END_ADD_DEFAULT_ROUTE:
if (add_default_route) {
if (priv->default_route6)
nm_ip6_config_add_route (composite, NMP_OBJECT_CAST_IP6_ROUTE (priv->default_route6), NULL);
if (priv->default_routegw6)
nm_ip6_config_add_route (composite, NMP_OBJECT_CAST_IP6_ROUTE (priv->default_routegw6), NULL);
}
/* Allow setting MTU etc */
if (commit) {
NMUtilsIPv6IfaceId iid;