morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

network/radv: modernize config_parse_router_preference()

Browse Source
This commit is contained in:
Yu Watanabe
2024-11-18 14:45:03 +09:00
committed by Luca Boccassi
parent c1b7db56e5
commit a10d6e0124
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-network-gperf.gperf
View File

@@ -408,7 +408,7 @@ IPv6SendRA.ReachableTimeSec, config_parse_router_uint32_msec_use
IPv6SendRA.RetransmitSec, config_parse_router_uint32_msec_usec, 0, offsetof(Network, router_retransmit_usec)
IPv6SendRA.Managed, config_parse_bool, 0, offsetof(Network, router_managed)
IPv6SendRA.OtherInformation, config_parse_bool, 0, offsetof(Network, router_other_information)
IPv6SendRA.RouterPreference, config_parse_router_preference, 0, 0
IPv6SendRA.RouterPreference, config_parse_router_preference, 0, offsetof(Network, router_preference)
IPv6SendRA.HopLimit, config_parse_uint8, 0, offsetof(Network, router_hop_limit)
IPv6SendRA.EmitDNS, config_parse_bool, 0, offsetof(Network, router_emit_dns)
IPv6SendRA.DNS, config_parse_radv_dns, 0, 0

23
src/network/networkd-radv.c
View File

@@ -1511,25 +1511,18 @@ int config_parse_router_preference(
void *data,
void *userdata) {
Network *network = userdata;
uint8_t *preference = ASSERT_PTR(data);
assert(filename);
assert(section);
assert(lvalue);
assert(rvalue);
assert(data);
if (streq(rvalue, "high"))
network->router_preference = SD_NDISC_PREFERENCE_HIGH;
else if (STR_IN_SET(rvalue, "medium", "normal", "default"))
network->router_preference = SD_NDISC_PREFERENCE_MEDIUM;
if (isempty(rvalue) || STR_IN_SET(rvalue, "medium", "normal", "default"))
*preference = SD_NDISC_PREFERENCE_MEDIUM;
else if (streq(rvalue, "high"))
*preference = SD_NDISC_PREFERENCE_HIGH;
else if (streq(rvalue, "low"))
network->router_preference = SD_NDISC_PREFERENCE_LOW;
*preference = SD_NDISC_PREFERENCE_LOW;
else
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Invalid router preference, ignoring assignment: %s", rvalue);
return log_syntax_parse_error(unit, filename, line, 0, lvalue, rvalue);
return 0;
return 1;
}
int config_parse_router_home_agent_lifetime(