diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-05-11 18:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 18:46:18 +0200 |
| commit | 6346a5f1a08e878e51213031ac33dcec08e368cd (patch) | |
| tree | 7ace538f7568a8005f0e4f0987b27f0fd8dde20b /src/conf_mode/interfaces-l2tpv3.py | |
| parent | 4ca0e563861f1d0ebf99afc012a9b95d9492e399 (diff) | |
| parent | 49fc2c83adfa2c5dc169cae675f65c8e36a7d6c4 (diff) | |
| download | vyos-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 'src/conf_mode/interfaces-l2tpv3.py')
| -rwxr-xr-x | src/conf_mode/interfaces-l2tpv3.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py index 26bb537e5..cdfc6ea84 100755 --- a/src/conf_mode/interfaces-l2tpv3.py +++ b/src/conf_mode/interfaces-l2tpv3.py @@ -35,6 +35,7 @@ default_config_data = { 'local_address': '', 'local_port': 5000, 'intf': '', + 'ipv6_accept_ra': 1, 'ipv6_autoconf': 0, 'ipv6_eui64_prefix': [], 'ipv6_forwarding': 1, @@ -132,6 +133,11 @@ def get_config(): if conf.exists('ipv6 dup-addr-detect-transmits'): l2tpv3['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits')) + # to make IPv6 SLAAC and DHCPv6 work with forwarding=1, + # accept_ra must be 2 + if l2tpv3['ipv6_autoconf'] or 'dhcpv6' in l2tpv3['address']: + l2tpv3['ipv6_accept_ra'] = 2 + # Maximum Transmission Unit (MTU) if conf.exists('mtu'): l2tpv3['mtu'] = int(conf.return_value('mtu')) @@ -241,6 +247,8 @@ def apply(l2tpv3): l.set_alias(l2tpv3['description']) # Maximum Transfer Unit (MTU) l.set_mtu(l2tpv3['mtu']) + # IPv6 accept RA + l.set_ipv6_accept_ra(l2tpv3['ipv6_accept_ra']) # IPv6 address autoconfiguration l.set_ipv6_autoconf(l2tpv3['ipv6_autoconf']) # IPv6 forwarding |