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

devices: be more precise about kernel IPv6 RA handling

Browse source 
We don't want the kernel to do IPv6 addrconf, but we do want it to
notice the non-router-related fields in the RA (eg, Retrans Timer) and
update the interface state to reflect them. So instead of turning off
accept_ra, we leave it turned on, and turn off accept_ra_defrtr,
accept_ra_rtr_pref, and accept_ra_pinfo instead.
This commit is contained in:
Dan Winship 2014-02-21 17:12:00 -05:00
parent 6136630163
commit c04db133fc
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -426,6 +426,9 @@ nm_device_ipv6_sysctl_set (NMDevice *self, const char *property, const char *val
static const char *ip6_properties_to_save[] = {
"accept_ra",
"accept_ra_defrtr",
"accept_ra_pinfo",
"accept_ra_rtr_pref",
"disable_ipv6",
"use_tempaddr",
};
@ -3527,7 +3530,10 @@ addrconf6_start_with_link_ready (NMDevice *self)
if (priv->hw_addr_len)
nm_rdisc_set_lladdr (priv->rdisc, (const char *) priv->hw_addr, priv->hw_addr_len);
nm_device_ipv6_sysctl_set (self, "accept_ra", "0");
nm_device_ipv6_sysctl_set (self, "accept_ra", "1");
nm_device_ipv6_sysctl_set (self, "accept_ra_defrtr", "0");
nm_device_ipv6_sysctl_set (self, "accept_ra_pinfo", "0");
nm_device_ipv6_sysctl_set (self, "accept_ra_rtr_pref", "0");
priv->rdisc_config_changed_sigid = g_signal_connect (priv->rdisc, NM_RDISC_CONFIG_CHANGED,
G_CALLBACK (rdisc_config_changed), self);
@ -6424,10 +6430,13 @@ nm_device_state_changed (NMDevice *device,
case NM_DEVICE_STATE_UNAVAILABLE:
if (old_state == NM_DEVICE_STATE_UNMANAGED) {
save_ip6_properties (device);
if (reason != NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED)
if (reason != NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED) {
nm_device_ipv6_sysctl_set (device, "disable_ipv6", "1");
nm_device_ipv6_sysctl_set (device, "accept_ra", "0");
nm_device_ipv6_sysctl_set (device, "use_tempaddr", "0");
nm_device_ipv6_sysctl_set (device, "accept_ra_defrtr", "0");
nm_device_ipv6_sysctl_set (device, "accept_ra_pinfo", "0");
nm_device_ipv6_sysctl_set (device, "accept_ra_rtr_pref", "0");
nm_device_ipv6_sysctl_set (device, "use_tempaddr", "0");
}
}
if (old_state == NM_DEVICE_STATE_UNMANAGED || priv->firmware_missing) {