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

core: handle route metric when reapplying dynamic IP methods

Browse source 
For dynamic IP methods (DHCP, IPv4LL, WWAN) the route metric is set at
activation/renewal time using the value from static configuration. To
support runtime change we need to update the dynamic configuration in
place and tell the DHCP client the new value to use for future
renewals.

https://bugzilla.redhat.com/show_bug.cgi?id=1528071
(cherry picked from commit b9e6433a02)
This commit is contained in:
Beniamino Galvani 2018-07-21 10:42:04 +02:00 • committed by Thomas Haller
parent d83dba3e3d
commit ca0f147bf4
5 changed files with 124 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10340,10 +10340,37 @@ nm_device_reactivate_ip4_config (NMDevice *self,
_set_ip_state (self, AF_INET, IP_WAIT);
if (!nm_device_activate_stage3_ip4_start (self))
_LOGW (LOGD_IP4, "Failed to apply IPv4 configuration");
} else {
if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
_LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration");
return;
}
if (s_ip4_old && s_ip4_new) {
gint64 metric_old, metric_new;
/* For dynamic IP methods (DHCP, IPv4LL, WWAN) the route metric is
* set at activation/renewal time using the value from static
* configuration. To support runtime change we need to update the
* dynamic configuration in place and tell the DHCP client the new
* value to use for future renewals.
*/
metric_old = nm_setting_ip_config_get_route_metric (s_ip4_old);
metric_new = nm_setting_ip_config_get_route_metric (s_ip4_new);
if (metric_old != metric_new) {
if (priv->dev_ip4_config.orig) {
nm_ip4_config_update_routes_metric ((NMIP4Config *) priv->dev_ip4_config.orig,
nm_device_get_route_metric (self, AF_INET));
}
if (priv->wwan_ip_config_4.orig) {
nm_ip4_config_update_routes_metric ((NMIP4Config *) priv->wwan_ip_config_4.orig,
nm_device_get_route_metric (self, AF_INET));
}
if (priv->dhcp4.client)
nm_dhcp_client_set_route_metric (priv->dhcp4.client, metric_new);
}
}
if (!ip_config_merge_and_apply (self, AF_INET, TRUE))
_LOGW (LOGD_IP4, "Failed to reapply IPv4 configuration");
}
}
@ -10385,10 +10412,36 @@ nm_device_reactivate_ip6_config (NMDevice *self,
_set_ip_state (self, AF_INET6, IP_WAIT);
if (!nm_device_activate_stage3_ip6_start (self))
_LOGW (LOGD_IP6, "Failed to apply IPv6 configuration");
} else {
if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
_LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration");
return;
}
if (s_ip6_old && s_ip6_new) {
gint64 metric_old, metric_new;
/* See comment in nm_device_reactivate_ip6_config() */
metric_old = nm_setting_ip_config_get_route_metric (s_ip6_old);
metric_new = nm_setting_ip_config_get_route_metric (s_ip6_new);
if (metric_old != metric_new) {
if (priv->ac_ip6_config.orig) {
nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->ac_ip6_config.orig,
nm_device_get_route_metric (self, AF_INET6));
}
if (priv->dhcp6.ip6_config.orig) {
nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->dhcp6.ip6_config.orig,
nm_device_get_route_metric (self, AF_INET6));
}
if (priv->wwan_ip_config_6.orig) {
nm_ip6_config_update_routes_metric ((NMIP6Config *) priv->wwan_ip_config_6.orig,
nm_device_get_route_metric (self, AF_INET6));
}
if (priv->dhcp6.client)
nm_dhcp_client_set_route_metric (priv->dhcp6.client, metric_new);
}
}
if (!ip_config_merge_and_apply (self, AF_INET6, TRUE))
_LOGW (LOGD_IP4, "Failed to reapply IPv6 configuration");
}
}

31
src/nm-ip4-config.c
View file

@ -645,6 +645,37 @@ nm_ip4_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i
return self;
}
void
nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric)
{
gs_free NMPlatformIP4Route *routes = NULL;
gboolean need_update = FALSE;
const NMPlatformIP4Route *r;
NMDedupMultiIter iter;
guint num = 0, i = 0;
nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) {
if (r->metric != metric)
need_update = TRUE;
num++;
}
if (!need_update)
return;
routes = g_new (NMPlatformIP4Route, num);
nm_ip_config_iter_ip4_route_for_each (&iter, self, &r) {
routes[i] = *r;
routes[i].metric = metric;
i++;
}
g_object_freeze_notify (G_OBJECT (self));
nm_ip4_config_reset_routes (self);
for (i = 0; i < num; i++)
nm_ip4_config_add_route (self, &routes[i], NULL);
g_object_thaw_notify (G_OBJECT (self));
}
void
nm_ip4_config_add_dependent_routes (NMIP4Config *self,
guint32 route_table,

1
src/nm-ip4-config.h
View file

@ -223,6 +223,7 @@ const NMPlatformIP4Route *_nmtst_ip4_config_get_route (const NMIP4Config *self,
const NMPlatformIP4Route *nm_ip4_config_get_direct_route_for_host (const NMIP4Config *self,
in_addr_t host,
guint32 route_table);
void nm_ip4_config_update_routes_metric (NMIP4Config *self, gint64 metric);
void nm_ip4_config_reset_nameservers (NMIP4Config *self);
void nm_ip4_config_add_nameserver (NMIP4Config *self, guint32 nameserver);

31
src/nm-ip6-config.c
View file

@ -427,6 +427,37 @@ nm_ip6_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int i
return self;
}
void
nm_ip6_config_update_routes_metric (NMIP6Config *self, gint64 metric)
{
gs_free NMPlatformIP6Route *routes = NULL;
gboolean need_update = FALSE;
const NMPlatformIP6Route *r;
NMDedupMultiIter iter;
guint num = 0, i = 0;
nm_ip_config_iter_ip6_route_for_each (&iter, self, &r) {
if (r->metric != metric)
need_update = TRUE;
num++;
}
if (!need_update)
return;
routes = g_new (NMPlatformIP6Route, num);
nm_ip_config_iter_ip6_route_for_each (&iter, self, &r) {
routes[i] = *r;
routes[i].metric = metric;
i++;
}
g_object_freeze_notify (G_OBJECT (self));
nm_ip6_config_reset_routes (self);
for (i = 0; i < num; i++)
nm_ip6_config_add_route (self, &routes[i], NULL);
g_object_thaw_notify (G_OBJECT (self));
}
void
nm_ip6_config_add_dependent_routes (NMIP6Config *self,
guint32 route_table,

2
src/nm-ip6-config.h
View file

@ -224,4 +224,6 @@ void nm_ip6_config_reset_routes_ndisc (NMIP6Config *self,
guint32 route_metric,
gboolean kernel_support_rta_pref);
void nm_ip6_config_update_routes_metric (NMIP6Config *self, gint64 metric);
#endif /* __NETWORKMANAGER_IP6_CONFIG_H__ */