From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 11 Jul 2019 01:17:30 +0000 (+0900)
Subject: network: NDA_LLADDR attribute can also take struct in_addr
X-Git-Tag: v243-rc1~148^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49808e0e2d01fd77df2e748de19cb402eb176bb9;p=thirdparty%2Fsystemd.git

network: NDA_LLADDR attribute can also take struct in_addr
---

diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
index 450e298f2ca..5e4d8a94a0a 100644
--- a/src/libsystemd/sd-netlink/netlink-types.c
+++ b/src/libsystemd/sd-netlink/netlink-types.c
@@ -663,7 +663,7 @@ static const NLTypeSystem rtnl_route_type_system = {
 
 static const NLType rtnl_neigh_types[] = {
         [NDA_DST]               = { .type = NETLINK_TYPE_IN_ADDR },
-        [NDA_LLADDR]            = { .type = NETLINK_TYPE_ETHER_ADDR },
+        [NDA_LLADDR]            = { /* struct ether_addr or struct in_addr */ },
         [NDA_CACHEINFO]         = { .type = NETLINK_TYPE_CACHE_INFO, .size = sizeof(struct nda_cacheinfo) },
         [NDA_PROBES]            = { .type = NETLINK_TYPE_U32 },
         [NDA_VLAN]              = { .type = NETLINK_TYPE_U16 },
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 2a748b8599f..9d755c96d6f 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -519,7 +519,7 @@ static int get_gateway_description(
                 if (!in_addr_equal(fam, &gw, gateway))
                         continue;
 
-                r = sd_netlink_message_read_ether_addr(m, NDA_LLADDR, &mac);
+                r = sd_netlink_message_read(m, NDA_LLADDR, sizeof(mac), &mac);
                 if (r < 0)
                         continue;
 
diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index e3333698f8a..4152823eb00 100644
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -143,7 +143,7 @@ int fdb_entry_configure(Link *link, FdbEntry *fdb_entry) {
         if (r < 0)
                 return rtnl_log_create_error(r);
 
-        r = sd_netlink_message_append_ether_addr(req, NDA_LLADDR, fdb_entry->mac_addr);
+        r = sd_netlink_message_append_data(req, NDA_LLADDR, fdb_entry->mac_addr, sizeof(struct ether_addr));
         if (r < 0)
                 return rtnl_log_create_error(r);
 
diff --git a/src/network/networkd-neighbor.c b/src/network/networkd-neighbor.c
index d0275fdd3ea..c3490cbfa29 100644
--- a/src/network/networkd-neighbor.c
+++ b/src/network/networkd-neighbor.c
@@ -133,7 +133,7 @@ int neighbor_configure(Neighbor *neighbor, Link *link, link_netlink_message_hand
         if (r < 0)
                 return log_error_errno(r, "Could not set flags: %m");
 
-        r = sd_netlink_message_append_ether_addr(req, NDA_LLADDR, &neighbor->mac);
+        r = sd_netlink_message_append_data(req, NDA_LLADDR, &neighbor->mac, sizeof(neighbor->mac));
         if (r < 0)
                 return log_error_errno(r, "Could not append NDA_LLADDR attribute: %m");