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-bridge.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-bridge.py')
| -rwxr-xr-x | src/conf_mode/interfaces-bridge.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py index c43fae78b..217ba95e1 100755 --- a/src/conf_mode/interfaces-bridge.py +++ b/src/conf_mode/interfaces-bridge.py @@ -48,6 +48,7 @@ default_config_data = { 'ip_enable_arp_accept': 0, 'ip_enable_arp_announce': 0, 'ip_enable_arp_ignore': 0, + 'ipv6_accept_ra': 1, 'ipv6_autoconf': 0, 'ipv6_eui64_prefix': [], 'ipv6_eui64_prefix_remove': [], @@ -197,6 +198,11 @@ def get_config(): and bridge['mac'] != BridgeIf(bridge['intf'], create=False).get_mac() ): bridge['ipv6_eui64_prefix_remove'] += bridge['ipv6_eui64_prefix'] + # to make IPv6 SLAAC and DHCPv6 work with forwarding=1, + # accept_ra must be 2 + if bridge['ipv6_autoconf'] or 'dhcpv6' in bridge['address']: + bridge['ipv6_accept_ra'] = 2 + # Interval at which neighbor bridges are removed if conf.exists('max-age'): bridge['max_age'] = int(conf.return_value('max-age')) @@ -302,6 +308,8 @@ def apply(bridge): br.set_arp_announce(bridge['ip_enable_arp_announce']) # configure ARP ignore br.set_arp_ignore(bridge['ip_enable_arp_ignore']) + # IPv6 accept RA + br.set_ipv6_accept_ra(bridge['ipv6_accept_ra']) # IPv6 address autoconfiguration br.set_ipv6_autoconf(bridge['ipv6_autoconf']) # IPv6 forwarding |