From f5bab0d9c0632890e69f907c168174a4904ca764 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 11 Jul 2019 10:48:41 +0900 Subject: [PATCH] network: fdb: use ether_addr_from_string() --- src/network/networkd-fdb.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index f53f661..5b7468c 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -215,17 +215,9 @@ int config_parse_fdb_hwaddr( if (r < 0) return log_oom(); - /* read in the MAC address for the FDB table. */ - r = sscanf(rvalue, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", - &fdb_entry->mac_addr.ether_addr_octet[0], - &fdb_entry->mac_addr.ether_addr_octet[1], - &fdb_entry->mac_addr.ether_addr_octet[2], - &fdb_entry->mac_addr.ether_addr_octet[3], - &fdb_entry->mac_addr.ether_addr_octet[4], - &fdb_entry->mac_addr.ether_addr_octet[5]); - - if (r != ETHER_ADDR_LEN) { - log_syntax(unit, LOG_ERR, filename, line, 0, "Not a valid MAC address, ignoring assignment: %s", rvalue); + r = ether_addr_from_string(rvalue, &fdb_entry->mac_addr); + if (r < 0) { + log_syntax(unit, LOG_ERR, filename, line, r, "Not a valid MAC address, ignoring assignment: %s", rvalue); return 0; } -- 2.7.4