]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
nlcache: addr_add: convert pointtopoint and broadcast attribute to ipaddress obj
authorJulien Fortin <jfortin@nvidia.com>
Fri, 18 Jun 2021 14:55:52 +0000 (16:55 +0200)
committerJulien Fortin <jfortin@nvidia.com>
Fri, 2 Jul 2021 16:15:00 +0000 (18:15 +0200)
the following config was broken:

auto swp1
iface swp1
      address 10.128.141.37/26
      broadcast 10.128.141.63

error: netlink: swp1: cannot add address 10.128.141.37/26 dev swp1: 'str' object has no attribute 'packed'

Signed-off-by: Julien Fortin <jfortin@nvidia.com>
ifupdown2/lib/nlcache.py

index e5257c44ff1051785f8439bb93a53b1e8629965c..84895359448838e56390436f3ad35ad11f2a3866 100644 (file)
@@ -3178,7 +3178,7 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject
 
             if broadcast:
                 log_msg.append("broadcast %s" % broadcast)
-                packet.add_attribute(Address.IFA_BROADCAST, broadcast)
+                packet.add_attribute(Address.IFA_BROADCAST, ipnetwork.IPAddress(broadcast))
 
             if preferred_lifetime:
                 # struct ifa_cacheinfo {
@@ -3200,6 +3200,8 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject
 
             if peer:
                 log_msg.append("peer %s" % peer)
+                peer = ipnetwork.IPAddress(peer)
+
                 packet.add_attribute(Address.IFA_ADDRESS, peer)
                 packet_prefixlen = peer.prefixlen
             else: