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

network/address: use config_parse_in_addr_non_null() at one more place

Browse Source 
No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2024-10-14 08:10:35 +09:00
parent 6f639b2555
commit 81fd92809d
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+6 -10
View File
@@ -2030,7 +2030,6 @@ static int config_parse_broadcast(
void *userdata) {
Address *address = ASSERT_PTR(userdata);
union in_addr_union u;
int r;
/* Do not check or set address->family here. It will be checked later in
@@ -2052,16 +2051,13 @@ static int config_parse_broadcast(
return 1;
}
r = in_addr_from_string(AF_INET, rvalue, &u);
if (r < 0)
return log_syntax_parse_error(unit, filename, line, r, lvalue, rvalue);
if (in4_addr_is_null(&u.in)) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Broadcast cannot be ANY address, ignoring assignment: %s", rvalue);
return 0;
}
r = config_parse_in_addr_non_null(
unit, filename, line, section, section_line,
lvalue, /* ltype = */ AF_INET, rvalue,
&address->broadcast, /* userdata = */ NULL);
if (r <= 0)
return r;
address->broadcast = u.in;
address->set_broadcast = true;
return 1;
}