Merge pull request #371 from jjakob/ipv6-link-local-fix

interfaces: T2362: IPv6 link-local and EUI64 address fixes

1 files changed, 32 insertions, 7 deletions

diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 380457772..4aef486b4 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019 VyOS maintainers and contributors
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -20,7 +20,7 @@ from copy import deepcopy
 from sys import exit
 from netifaces import interfaces
 
-from vyos.ifconfig import BondIf
+from vyos.ifconfig import BondIf, Section
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
 from vyos.configdict import list_diff, vlan_to_dict
 from vyos.config import Config
@@ -52,7 +52,8 @@ default_config_data = {
     'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
     'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': '',
+    'ipv6_eui64_prefix': [],
+    'ipv6_eui64_prefix_remove': [],
     'ipv6_forwarding': 1,
     'ipv6_dup_addr_detect': 1,
     'is_bridge_member': False,
@@ -202,9 +203,21 @@ def get_config():
     if conf.exists('ipv6 address autoconf'):
         bond['ipv6_autoconf'] = 1
 
-    # Get prefix for IPv6 addressing based on MAC address (EUI-64)
+    # Get prefixes for IPv6 addressing based on MAC address (EUI-64)
     if conf.exists('ipv6 address eui64'):
-        bond['ipv6_eui64_prefix'] = conf.return_value('ipv6 address eui64')
+        bond['ipv6_eui64_prefix'] = conf.return_values('ipv6 address eui64')
+
+    # Determine currently effective EUI64 addresses - to determine which
+    # address is no longer valid and needs to be removed
+    eff_addr = conf.return_effective_values('ipv6 address eui64')
+    bond['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, bond['ipv6_eui64_prefix'])
+
+    # Remove the default link-local address if set.
+    if conf.exists('ipv6 address no-default-link-local'):
+        bond['ipv6_eui64_prefix_remove'].append('fe80::/64')
+    else:
+        # add the link-local by default to make IPv6 work
+        bond['ipv6_eui64_prefix'].append('fe80::/64')
 
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
@@ -218,6 +231,12 @@ def get_config():
     if conf.exists('mac'):
         bond['mac'] = conf.return_value('mac')
 
+    # Find out if MAC has changed - if so, we need to delete all IPv6 EUI64 addresses
+    # before re-adding them
+    if ( bond['mac'] and bond['intf'] in Section.interfaces(section='bonding')
+            and bond['mac'] != BondIf(bond['intf'], create=False).get_mac() ):
+        bond['ipv6_eui64_prefix_remove'] += bond['ipv6_eui64_prefix']
+
     # Bonding mode
     if conf.exists('mode'):
         act_mode = conf.return_value('mode')
@@ -434,17 +453,23 @@ def apply(bond):
         b.set_proxy_arp_pvlan(bond['ip_proxy_arp_pvlan'])
         # IPv6 address autoconfiguration
         b.set_ipv6_autoconf(bond['ipv6_autoconf'])
-        # IPv6 EUI-based address
-        b.set_ipv6_eui64_address(bond['ipv6_eui64_prefix'])
         # IPv6 forwarding
         b.set_ipv6_forwarding(bond['ipv6_forwarding'])
         # IPv6 Duplicate Address Detection (DAD) tries
         b.set_ipv6_dad_messages(bond['ipv6_dup_addr_detect'])
 
+        # Delete old IPv6 EUI64 addresses before changing MAC
+        for addr in bond['ipv6_eui64_prefix_remove']:
+            b.del_ipv6_eui64_address(addr)
+
         # Change interface MAC address
         if bond['mac']:
             b.set_mac(bond['mac'])
 
+        # Add IPv6 EUI-based addresses
+        for addr in bond['ipv6_eui64_prefix']:
+            b.add_ipv6_eui64_address(addr)
+
         # Maximum Transmission Unit (MTU)
         b.set_mtu(bond['mtu'])