picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

network: replace NDISC -> NDisc in log messages

Browse source
This commit is contained in:
Yu Watanabe 2020-07-18 05:46:53 +09:00
parent 5eec0a0810
commit a8c10331b4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/network/networkd-link.c
View file

@ -4229,7 +4229,7 @@ int link_save(Link *link) {
sd_dhcp6_lease_get_dns, sd_dhcp6_lease_get_dns,
NULL); NULL);
/* Make sure to flush out old entries before we use the NDISC data */ /* Make sure to flush out old entries before we use the NDisc data */
ndisc_vacuum(link); ndisc_vacuum(link);
if (link->network->ipv6_accept_ra_use_dns && link->ndisc_rdnss) { if (link->network->ipv6_accept_ra_use_dns && link->ndisc_rdnss) {

8
src/network/networkd-ndisc.c
View file

@ -815,14 +815,14 @@ static void ndisc_handler(sd_ndisc *nd, sd_ndisc_event event, sd_ndisc_router *r
break; break;
case SD_NDISC_EVENT_TIMEOUT: case SD_NDISC_EVENT_TIMEOUT:
log_link_debug(link, "NDISC handler get timeout event"); log_link_debug(link, "NDisc handler get timeout event");
link->ndisc_addresses_configured = true; link->ndisc_addresses_configured = true;
link->ndisc_routes_configured = true; link->ndisc_routes_configured = true;
link_check_ready(link); link_check_ready(link);
break; break;
default: default:
assert_not_reached("IPv6 Neighbor Discovery unknown event"); assert_not_reached("Unknown NDisc event");
} }
} }
@ -948,7 +948,7 @@ int config_parse_ndisc_deny_listed_prefix(
return log_oom(); return log_oom();
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, log_syntax(unit, LOG_WARNING, filename, line, r,
"Failed to parse NDISC deny-listed prefix, ignoring assignment: %s", "Failed to parse NDisc deny-listed prefix, ignoring assignment: %s",
rvalue); rvalue);
return 0; return 0;
} }
@ -958,7 +958,7 @@ int config_parse_ndisc_deny_listed_prefix(
r = in_addr_from_string(AF_INET6, n, &ip); r = in_addr_from_string(AF_INET6, n, &ip);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_WARNING, filename, line, r, log_syntax(unit, LOG_WARNING, filename, line, r,
"NDISC deny-listed prefix is invalid, ignoring assignment: %s", n); "NDisc deny-listed prefix is invalid, ignoring assignment: %s", n);
continue; continue;
} }