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

nm-device: change route table sync mode behaviour

Browse source 
NM will now sync all tables when a connection has specified
at least 1 local route in 'ipv[4|6].routes' to correctly
reconcile local routes when reapplying connections on a device.

If the connection has no local routes only the main table will be
taken into account preserving the previous NM's behaviour.

https://bugzilla.redhat.com/show_bug.cgi?id=1821787
This commit is contained in:
Antonio Cardace 2020-07-06 19:09:35 +02:00
parent 9ecc27f6d3
commit c5496f7372
No known key found for this signature in database
GPG key ID: 6BF80ABD43E377D3
1 changed files with 48 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,8 +411,8 @@ typedef struct _NMDevicePrivate {
bool v4_route_table_initialized:1;
bool v6_route_table_initialized:1;
bool v4_route_table_full_sync_before:1;
bool v6_route_table_full_sync_before:1;
bool v4_route_table_all_sync_before:1;
bool v6_route_table_all_sync_before:1;
NMDeviceAutoconnectBlockedFlags autoconnect_blocked_flags:5;
@ -2737,34 +2737,59 @@ _get_route_table_sync_mode_stateful (NMDevice *self,
int addr_family)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
gboolean full_sync_now;
gboolean full_sync_eff;
NMDedupMultiIter ipconf_iter;
gboolean all_sync_now;
gboolean all_sync_eff;
full_sync_now = _get_route_table (self, addr_family) != 0u;
all_sync_now = _get_route_table (self, addr_family) != 0u;
if (full_sync_now)
full_sync_eff = TRUE;
if (!all_sync_now) {
/* If there's a local route switch to all-sync in order
* to properly manage the local table */
if (addr_family == AF_INET) {
const NMPlatformIP4Route *route;
nm_ip_config_iter_ip4_route_for_each (&ipconf_iter, priv->con_ip_config_4, &route) {
if (nm_platform_route_type_uncoerce (route->type_coerced) == RTN_LOCAL) {
all_sync_now = TRUE;
break;
}
}
} else {
const NMPlatformIP6Route *route;
nm_ip_config_iter_ip6_route_for_each (&ipconf_iter, priv->con_ip_config_6, &route) {
if (nm_platform_route_type_uncoerce (route->type_coerced) == RTN_LOCAL) {
all_sync_now = TRUE;
break;
}
}
}
}
if (all_sync_now)
all_sync_eff = TRUE;
else {
/* When we change from full-sync to no full-sync, we do a last full-sync one
* more time. For that, we determine the effective full-state based on the
* cached/previous full-sync flag.
/* When we change from all-sync to no all-sync, we do a last all-sync one
* more time. For that, we determine the effective all-state based on the
* cached/previous all-sync flag.
*
* The purpose of this is to support reapply of route-table (and thus the
* full-sync mode). If reapply toggles from full-sync to no-full-sync, we must
* all-sync mode). If reapply toggles from all-sync to no-all-sync, we must
* sync one last time. */
if (addr_family == AF_INET)
full_sync_eff = priv->v4_route_table_full_sync_before;
all_sync_eff = priv->v4_route_table_all_sync_before;
else
full_sync_eff = priv->v6_route_table_full_sync_before;
all_sync_eff = priv->v6_route_table_all_sync_before;
}
if (addr_family == AF_INET)
priv->v4_route_table_full_sync_before = full_sync_now;
priv->v4_route_table_all_sync_before = all_sync_now;
else
priv->v6_route_table_full_sync_before = full_sync_now;
priv->v6_route_table_all_sync_before = all_sync_now;
return full_sync_eff
? NM_IP_ROUTE_TABLE_SYNC_MODE_FULL
return all_sync_eff
? NM_IP_ROUTE_TABLE_SYNC_MODE_ALL
: NM_IP_ROUTE_TABLE_SYNC_MODE_MAIN;
}
@ -13244,7 +13269,8 @@ nm_device_set_ip_config (NMDevice *self,
if (IS_IPv4) {
success = nm_ip4_config_commit (NM_IP4_CONFIG (new_config),
nm_device_get_platform (self),
_get_route_table_sync_mode_stateful (self, addr_family));
_get_route_table_sync_mode_stateful (self,
AF_INET));
nm_platform_ip4_dev_route_blacklist_set (nm_device_get_platform (self),
nm_ip_config_get_ifindex (new_config),
ip4_dev_route_blacklist);
@ -13253,7 +13279,8 @@ nm_device_set_ip_config (NMDevice *self,
success = nm_ip6_config_commit (NM_IP6_CONFIG (new_config),
nm_device_get_platform (self),
_get_route_table_sync_mode_stateful (self, addr_family),
_get_route_table_sync_mode_stateful (self,
AF_INET6),
&temporary_not_available);
if (!_rt6_temporary_not_available_set (self, temporary_not_available))
@ -15498,8 +15525,8 @@ _cleanup_generic_post (NMDevice *self, CleanupType cleanup_type)
priv->v4_route_table_initialized = FALSE;
priv->v6_route_table_initialized = FALSE;
priv->v4_route_table_full_sync_before = FALSE;
priv->v6_route_table_full_sync_before = FALSE;
priv->v4_route_table_all_sync_before = FALSE;
priv->v6_route_table_all_sync_before = FALSE;
priv->default_route_metric_penalty_ip4_has = FALSE;
priv->default_route_metric_penalty_ip6_has = FALSE;