summaryrefslogtreecommitdiff
path: root/python/vyos/configdict.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-11 18:46:18 +0200
committerGitHub <noreply@github.com>2020-05-11 18:46:18 +0200
commit6346a5f1a08e878e51213031ac33dcec08e368cd (patch)
tree7ace538f7568a8005f0e4f0987b27f0fd8dde20b /python/vyos/configdict.py
parent4ca0e563861f1d0ebf99afc012a9b95d9492e399 (diff)
parent49fc2c83adfa2c5dc169cae675f65c8e36a7d6c4 (diff)
downloadvyos-1x-6346a5f1a08e878e51213031ac33dcec08e368cd.tar.gz
vyos-1x-6346a5f1a08e878e51213031ac33dcec08e368cd.zip
Merge pull request #407 from jjakob/accept-ra-fix-T2449
T2449: set 'accept_ra=2' if 'address dhcpv6' or 'ipv6 address autoconf' is set
Diffstat (limited to 'python/vyos/configdict.py')
-rw-r--r--python/vyos/configdict.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 5ca369f66..8325355e8 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -122,6 +122,7 @@ vlan_default = {
'ip_enable_arp_announce': 0,
'ip_enable_arp_ignore': 0,
'ip_proxy_arp': 0,
+ 'ipv6_accept_ra': 1,
'ipv6_autoconf': 0,
'ipv6_eui64_prefix': [],
'ipv6_eui64_prefix_remove': [],
@@ -348,6 +349,11 @@ def intf_to_dict(conf, default):
# If the interface does not exist, it could not have changed
pass
+ # to make IPv6 SLAAC and DHCPv6 work with forwarding=1,
+ # accept_ra must be 2
+ if intf['ipv6_autoconf'] or 'dhcpv6' in intf['address']:
+ intf['ipv6_accept_ra'] = 2
+
return intf, disable