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

device: flush IP configuration of slaves during activation

Browse source 
If a device only has an IPv6 link-local address, we don't generate an
assumed connection. Therefore, when a new slave connection (without IP
configuration) is activated on the device, we don't deactivate any
existing connection and the link-local address remains configured.

The IP configuration of an activated slave should be predictable and
not depend on the previous state; let's flush addresses and routes on
activation.

https://bugzilla.redhat.com/show_bug.cgi?id=1816517
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/480
This commit is contained in:
Beniamino Galvani 2020-04-23 08:48:33 +02:00
parent d9dbe88427
commit e302f5ff77
1 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10566,6 +10566,8 @@ act_stage3_ip_config_start (NMDevice *self,
} else { } else {
NMSettingIP6ConfigPrivacy ip6_privacy = NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN; NMSettingIP6ConfigPrivacy ip6_privacy = NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN;
const char *ip6_privacy_str = "0"; const char *ip6_privacy_str = "0";
NMPlatform *platform;
int ifindex;
if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED)) { if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED)) {
nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1"); nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
@ -10573,18 +10575,35 @@ act_stage3_ip_config_start (NMDevice *self,
} }
if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { if (nm_streq (method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
if ( !priv->master if (!nm_device_sys_iface_state_is_external (self)) {
&& !nm_device_sys_iface_state_is_external (self)) { if (priv->master) {
gboolean ipv6ll_handle_old = priv->ipv6ll_handle; /* If a device only has an IPv6 link-local address,
* we don't generate an assumed connection. Therefore,
* when a new slave connection (without IP configuration)
* is activated on the device, the link-local address
* remains configured. The IP configuration of an activated
* slave should not depend on the previous state. Flush
* addresses and routes on activation.
*/
ifindex = nm_device_get_ip_ifindex (self);
platform = nm_device_get_platform (self);
/* When activating an IPv6 'ignore' connection we need to revert back if (ifindex > 0) {
* to kernel IPv6LL, but the kernel won't actually assign an address nm_platform_ip_route_flush (platform, AF_INET6, ifindex);
* to the interface until disable_ipv6 is bounced. nm_platform_ip_address_flush (platform, AF_INET6, ifindex);
*/ }
set_nm_ipv6ll (self, FALSE); } else {
if (ipv6ll_handle_old) gboolean ipv6ll_handle_old = priv->ipv6ll_handle;
nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
restore_ip6_properties (self); /* When activating an IPv6 'ignore' connection we need to revert back
* to kernel IPv6LL, but the kernel won't actually assign an address
* to the interface until disable_ipv6 is bounced.
*/
set_nm_ipv6ll (self, FALSE);
if (ipv6ll_handle_old)
nm_device_sysctl_ip_conf_set (self, AF_INET6, "disable_ipv6", "1");
restore_ip6_properties (self);
}
} }
return NM_ACT_STAGE_RETURN_IP_DONE; return NM_ACT_STAGE_RETURN_IP_DONE;
} }