shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

network/address-label: several cleanups for conf parsers

Browse Source 
- Check userdata, instead of data, though they point to the same
  position.
- Support an empty string.
- Use UINT32_MAX, as the label is uint32_t.
This commit is contained in:
Yu Watanabe 2024-08-17 12:38:44 +09:00
parent c95fa6acb5
commit 4dfbecd2ff
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/networkd-address-label.c
View File

@ -234,12 +234,18 @@ int config_parse_address_label_prefix(
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
assert(userdata);
r = address_label_new_static(network, filename, section_line, &n);
if (r < 0)
return log_oom();
if (isempty(rvalue)) {
n->prefix_set = false;
TAKE_PTR(n);
return 0;
}
r = in_addr_prefix_from_string(rvalue, AF_INET6, &a, &prefixlen);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r,
@ -257,7 +263,6 @@ int config_parse_address_label_prefix(
n->prefix = a.in6;
n->prefixlen = prefixlen;
n->prefix_set = true;
TAKE_PTR(n);
return 0;
}
@ -283,25 +288,30 @@ int config_parse_address_label(
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
assert(userdata);
r = address_label_new_static(network, filename, section_line, &n);
if (r < 0)
return log_oom();
if (isempty(rvalue)) {
n->label = UINT32_MAX;
TAKE_PTR(n);
return 0;
}
r = safe_atou32(rvalue, &k);
if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse address label, ignoring: %s", rvalue);
return 0;
}
if (k == UINT_MAX) {
if (k == UINT32_MAX) {
log_syntax(unit, LOG_WARNING, filename, line, 0, "Address label is invalid, ignoring: %s", rvalue);
return 0;
}
n->label = k;
TAKE_PTR(n);
return 0;
}