SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ether-addr-util: replace ether_addr_from_string() with parse_ether_addr()

Browse Source
This commit is contained in:
Yu Watanabe
2021-11-09 21:39:09 +09:00
parent 02160bc909
commit 227e9ce255
12 changed files with 14 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/ether-addr-util.c
-72
View File
@@ -94,78 +94,6 @@ static void ether_addr_hash_func(const struct ether_addr *p, struct siphash *sta
DEFINE_HASH_OPS(ether_addr_hash_ops, struct ether_addr, ether_addr_hash_func, ether_addr_compare);
int ether_addr_from_string(const char *s, struct ether_addr *ret) {
size_t pos = 0, n, field;
char sep = '\0';
const char *hex = HEXDIGITS, *hexoff;
size_t x;
bool touched;
#define parse_fields(v) \
for (field = 0; field < ELEMENTSOF(v); field++) { \
touched = false; \
for (n = 0; n < (2 * sizeof(v[0])); n++) { \
if (s[pos] == '\0') \
break; \
hexoff = strchr(hex, s[pos]); \
if (!hexoff) \
break; \
assert(hexoff >= hex); \
x = hexoff - hex; \
if (x >= 16) \
x -= 6; /* A-F */ \
assert(x < 16); \
touched = true; \
v[field] <<= 4; \
v[field] += x; \
pos++; \
} \
if (!touched) \
return -EINVAL; \
if (field < (ELEMENTSOF(v)-1)) { \
if (s[pos] != sep) \
return -EINVAL; \
else \
pos++; \
} \
}
assert(s);
assert(ret);
s += strspn(s, WHITESPACE);
sep = s[strspn(s, hex)];
if (sep == '.') {
uint16_t shorts[3] = { 0 };
parse_fields(shorts);
if (s[pos] != '\0')
return -EINVAL;
for (n = 0; n < ELEMENTSOF(shorts); n++) {
ret->ether_addr_octet[2*n] = ((shorts[n] & (uint16_t)0xff00) >> 8);
ret->ether_addr_octet[2*n + 1] = (shorts[n] & (uint16_t)0x00ff);
}
} else if (IN_SET(sep, ':', '-')) {
struct ether_addr out = ETHER_ADDR_NULL;
parse_fields(out.ether_addr_octet);
if (s[pos] != '\0')
return -EINVAL;
for (n = 0; n < ELEMENTSOF(out.ether_addr_octet); n++)
ret->ether_addr_octet[n] = out.ether_addr_octet[n];
} else
return -EINVAL;
return 0;
}
static int parse_hw_addr_one_field(const char **s, char sep, size_t len, uint8_t *buf) {
const char *hex = HEXDIGITS, *p;
uint16_t data = 0;
src/basic/ether-addr-util.h
-2
View File
@@ -92,6 +92,4 @@ static inline bool ether_addr_is_local(const struct ether_addr *addr) {
return !FLAGS_SET(addr->ether_addr_octet[0], 0x02);
}
int ether_addr_from_string(const char *s, struct ether_addr *ret);
extern const struct hash_ops ether_addr_hash_ops;
src/network/generator/network-generator.c
+2 -2
View File
@@ -353,7 +353,7 @@ static int network_set_mac_address(Context *context, const char *ifname, const c
if (!network)
return -ENODEV;
return ether_addr_from_string(mac, &network->mac);
return parse_ether_addr(mac, &network->mac);
}
static int network_set_address(Context *context, const char *ifname, int family, unsigned char prefixlen,
@@ -909,7 +909,7 @@ static int parse_cmdline_ifname(Context *context, const char *key, const char *v
name = strndupa_safe(value, p - value);
r = ether_addr_from_string(p + 1, &mac);
r = parse_ether_addr(p + 1, &mac);
if (r < 0)
return r;
src/network/netdev/bond.c
+1 -1
View File
@@ -386,7 +386,7 @@ int config_parse_ad_actor_system(
assert(rvalue);
assert(data);
r = ether_addr_from_string(rvalue, &n);
r = parse_ether_addr(rvalue, &n);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Not a valid MAC address %s. Ignoring assignment: %m",
src/network/netdev/macsec.c
+1 -1
View File
@@ -620,7 +620,7 @@ int config_parse_macsec_hw_address(
if (r < 0)
return log_oom();
r = ether_addr_from_string(rvalue, b ? &b->sci.mac : &c->sci.mac);
r = parse_ether_addr(rvalue, b ? &b->sci.mac : &c->sci.mac);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse MAC address for secure channel identifier. "
src/network/networkd-bridge-fdb.c
+1 -1
View File
@@ -286,7 +286,7 @@ int config_parse_fdb_hwaddr(
if (r < 0)
return log_oom();
r = ether_addr_from_string(rvalue, &fdb->mac_addr);
r = parse_ether_addr(rvalue, &fdb->mac_addr);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Not a valid MAC address, ignoring assignment: %s", rvalue);
return 0;
src/network/networkd-dhcp-server-static-lease.c
+1 -1
View File
@@ -184,7 +184,7 @@ int config_parse_dhcp_static_lease_hwaddr(
return 0;
}
r = ether_addr_from_string(rvalue, &hwaddr);
r = parse_ether_addr(rvalue, &hwaddr);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse MAC address for DHCPv4 static lease, ignoring assignment: %s", rvalue);
src/network/networkd-neighbor.c
+2 -2
View File
@@ -680,7 +680,7 @@ int config_parse_neighbor_lladdr(
if (r < 0)
return log_oom();
r = ether_addr_from_string(rvalue, &n->lladdr.mac);
r = parse_ether_addr(rvalue, &n->lladdr.mac);
if (r >= 0)
n->lladdr_size = sizeof(n->lladdr.mac);
else {
@@ -725,7 +725,7 @@ int config_parse_neighbor_hwaddr(
if (r < 0)
return log_oom();
r = ether_addr_from_string(rvalue, &n->lladdr.mac);
r = parse_ether_addr(rvalue, &n->lladdr.mac);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Neighbor MACAddress= is invalid, ignoring assignment: %s", rvalue);
src/network/networkd-sriov.c
+1 -1
View File
@@ -523,7 +523,7 @@ int config_parse_sr_iov_mac(
return 0;
}
r = ether_addr_from_string(rvalue, &sr_iov->mac);
r = parse_ether_addr(rvalue, &sr_iov->mac);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse SR-IOV '%s=', ignoring assignment: %s", lvalue, rvalue);
src/network/test-networkd-conf.c
+1 -1
View File
@@ -111,7 +111,7 @@ static void test_config_parse_hwaddr(void) {
test_config_parse_hwaddr_one("no:ta:ma:ca:dd:re", 0, NULL);
test_config_parse_hwaddr_one("aa:bb:cc:dd:ee:fx", 0, NULL);
test_config_parse_hwaddr_one("aa:bb:cc:dd:ee:ff", 0, &t[0]);
test_config_parse_hwaddr_one(" aa:bb:cc:dd:ee:ff", 0, &t[0]);
test_config_parse_hwaddr_one(" aa:bb:cc:dd:ee:ff", 0, NULL);
test_config_parse_hwaddr_one("aa:bb:cc:dd:ee:ff \t\n", 0, NULL);
test_config_parse_hwaddr_one("aa:bb:cc:dd:ee:ff \t\nxxx", 0, NULL);
test_config_parse_hwaddr_one("aa:bb:cc: dd:ee:ff", 0, NULL);
src/shared/conf-parser.c
+2 -2
View File
@@ -1350,7 +1350,7 @@ int config_parse_hwaddr(
if (!n)
return log_oom();
r = ether_addr_from_string(rvalue, n);
r = parse_ether_addr(rvalue, n);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Not a valid MAC address, ignoring assignment: %s", rvalue);
@@ -1407,7 +1407,7 @@ int config_parse_hwaddrs(
if (!n)
return log_oom();
r = ether_addr_from_string(word, n);
r = parse_ether_addr(word, n);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
"Not a valid MAC address, ignoring: %s", word);
src/udev/net/link-config.c
+2 -2
View File
@@ -118,8 +118,8 @@ static int link_parse_wol_password(LinkConfig *link, const char *str) {
if (!p)
return -ENOMEM;
/* Reuse ether_addr_from_string(), as their formats are equivalent. */
r = ether_addr_from_string(str, (struct ether_addr*) p);
/* Reuse parse_ether_addr(), as their formats are equivalent. */
r = parse_ether_addr(str, (struct ether_addr*) p);
if (r < 0)
return r;