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-wireless.py b/src/conf_mode/interfaces-wireless.py
index 42842f9bd..148a7f6e0 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.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
@@ -25,7 +25,7 @@ from netaddr import EUI, mac_unix_expanded
 
 from vyos.config import Config
 from vyos.configdict import list_diff, vlan_to_dict
-from vyos.ifconfig import WiFiIf
+from vyos.ifconfig import WiFiIf, Section
 from vyos.ifconfig_vlan import apply_vlan_config, verify_vlan_config
 from vyos.template import render
 from vyos.util import chown, call
@@ -88,7 +88,8 @@ default_config_data = {
     'ip_enable_arp_announce': 0,
     'ip_enable_arp_ignore': 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,
@@ -368,9 +369,21 @@ def get_config():
     if conf.exists('ipv6 address autoconf'):
         wifi['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'):
-        wifi['ipv6_eui64_prefix'] = conf.return_value('ipv6 address eui64')
+        wifi['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')
+    wifi['ipv6_eui64_prefix_remove'] = list_diff(eff_addr, wifi['ipv6_eui64_prefix'])
+
+    # Remove the default link-local address if set.
+    if conf.exists('ipv6 address no-default-link-local'):
+        wifi['ipv6_eui64_prefix_remove'].append('fe80::/64')
+    else:
+        # add the link-local by default to make IPv6 work
+        wifi['ipv6_eui64_prefix'].append('fe80::/64')
 
     # ARP enable ignore
     if conf.exists('ip enable-arp-ignore'):
@@ -392,6 +405,12 @@ def get_config():
     if conf.exists('mac'):
         wifi['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 ( wifi['mac'] and wifi['intf'] in Section.interfaces(section='wireless')
+            and wifi['mac'] != WiFiIf(wifi['intf'], create=False).get_mac() ):
+        wifi['ipv6_eui64_prefix_remove'] += wifi['ipv6_eui64_prefix']
+
     # Maximum number of wireless radio stations
     if conf.exists('max-stations'):
         wifi['max_stations'] = conf.return_value('max-stations')
@@ -696,6 +715,10 @@ def apply(wifi):
         # ignore link state changes
         w.set_link_detect(wifi['disable_link_detect'])
 
+        # Delete old IPv6 EUI64 addresses before changing MAC
+        for addr in wifi['ipv6_eui64_prefix_remove']:
+            w.del_ipv6_eui64_address(addr)
+
         # Change interface MAC address - re-set to real hardware address (hw-id)
         # if custom mac is removed
         if wifi['mac']:
@@ -703,6 +726,10 @@ def apply(wifi):
         elif wifi['hw_id']:
             w.set_mac(wifi['hw_id'])
 
+        # Add IPv6 EUI-based addresses
+        for addr in wifi['ipv6_eui64_prefix']:
+            w.add_ipv6_eui64_address(addr)
+
         # configure ARP filter configuration
         w.set_arp_filter(wifi['ip_disable_arp_filter'])
         # configure ARP accept
@@ -713,8 +740,6 @@ def apply(wifi):
         w.set_arp_ignore(wifi['ip_enable_arp_ignore'])
         # IPv6 address autoconfiguration
         w.set_ipv6_autoconf(wifi['ipv6_autoconf'])
-        # IPv6 EUI-based address
-        w.set_ipv6_eui64_address(wifi['ipv6_eui64_prefix'])
         # IPv6 forwarding
         w.set_ipv6_forwarding(wifi['ipv6_forwarding'])
         # IPv6 Duplicate Address Detection (DAD) tries