mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

netlink: nlpacket AttributeMACAddress

Browse Source 
This commits fixes AttributeMACAddress for GREv6.
Error message: info: netlink: link dump failed: Length of MACAddress attribute not supported: 20
Reproducible by adding a GREv6 Tunnel:

auto gre1
iface gre1 inet tunnel
    mode ip6gre
    local 2001:1000:1000:1000::123
    endpoint 2001:1000:1000:2000::123
    address 192.168.123.1/29

In netlink The IFLA_ADDRESS and IFLA_BROADCAST attributes for all interfaces has been a
6-byte MAC address. But the GRE interface uses a 4-byte IP address and GREv6 uses a 16-byte IPv6 address for this
attribute. This patch allows for decoding a 16-byte value as an IP address.
This commit is contained in:
Sven Auhagen
2018-06-27 07:24:21 +02:00
committed by Julien Fortin
parent 84ca91f165
commit 08862a99f9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ifupdown2/nlmanager/nlpacket.py
View File

@@ -535,11 +535,18 @@ class AttributeMACAddress(Attribute):
self.decode_length_type(data)
try:
if self.length == 10:
# MAC Address
if self.length == 8:
self.value = IPv4Address(unpack('>L', self.data[4:])[0])
self.value_int = int(self.value)
self.value_int_str = str(self.value_int)
# GRE interface uses a 4-byte IP address for this attribute
elif self.length == 10:
(data1, data2) = unpack(self.PACK, self.data[4:])
self.value = mac_int_to_str(data1 << 16 | data2)
elif self.length == 8:
self.value = IPv4Address(unpack('>L', self.data[4:])[0])
# GREv6 interface uses a 16-byte IP address for this attribute
elif self.length == 20:
self.value = IPv6Address(unpack('>L', self.data[16:])[0])
self.value_int = int(self.value)
self.value_int_str = str(self.value_int)
else: