system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 10:44:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #32240 from yuwata/network-ndisc-fix-on-link-prefix

Browse source 
network/ndisc: fixlets for on-link prefix
This commit is contained in:
Daan De Meyer 2024-04-12 08:46:34 +02:00 committed by GitHub
parent 3a768db480 b263362254
commit dd63f00c64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1224,59 +1224,23 @@ static int ndisc_router_process_onlink_prefix(Link *link, sd_ndisc_router *rt) {
route->pref = preference;
route->lifetime_usec = lifetime_usec;
r = ndisc_request_router_route(route, link, rt);
if (r < 0)
return log_link_warning_errno(link, r, "Could not request prefix route: %m");
return 0;
}
static int ndisc_router_drop_onlink_prefix(Link *link, sd_ndisc_router *rt) {
_cleanup_(route_unrefp) Route *route = NULL;
uint8_t prefixlen;
struct in6_addr prefix;
usec_t lifetime_usec;
int r;
assert(link);
assert(link->network);
assert(rt);
/* RFC 4861 section 6.3.4.
* Note, however, that a Prefix Information option with the on-link flag set to zero conveys no
* information concerning on-link determination and MUST NOT be interpreted to mean that addresses
* covered by the prefix are off-link. The only way to cancel a previous on-link indication is to
* advertise that prefix with the L-bit set and the Lifetime set to zero. */
if (!link->network->ndisc_use_onlink_prefix)
return 0;
r = sd_ndisc_router_prefix_get_valid_lifetime(rt, &lifetime_usec);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get prefix lifetime: %m");
if (lifetime_usec != 0)
return 0;
r = sd_ndisc_router_prefix_get_address(rt, &prefix);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get prefix address: %m");
r = sd_ndisc_router_prefix_get_prefixlen(rt, &prefixlen);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get prefix length: %m");
r = route_new(&route);
if (r < 0)
return log_oom();
route->family = AF_INET6;
route->dst.in6 = prefix;
route->dst_prefixlen = prefixlen;
r = ndisc_remove_route(route, link);
if (r < 0)
return log_link_warning_errno(link, r, "Could not remove prefix route: %m");
/* RFC 4861 section 6.3.4:
* - If the prefix is not already present in the Prefix List, and the Prefix Information option's
* Valid Lifetime field is non-zero, create a new entry for the prefix and initialize its
* invalidation timer to the Valid Lifetime value in the Prefix Information option.
*
* - If the prefix is already present in the host's Prefix List as the result of a previously
* received advertisement, reset its invalidation timer to the Valid Lifetime value in the Prefix
* Information option. If the new Lifetime value is zero, time-out the prefix immediately. */
if (lifetime_usec == 0) {
r = ndisc_remove_route(route, link);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to remove prefix route: %m");
} else {
r = ndisc_request_router_route(route, link, rt);
if (r < 0)
return log_link_warning_errno(link, r, "Failed to request prefix route: %m");
}
return 0;
}
@ -1319,12 +1283,11 @@ static int ndisc_router_process_prefix(Link *link, sd_ndisc_router *rt) {
if (r < 0)
return log_link_warning_errno(link, r, "Failed to get RA prefix flags: %m");
if (FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK))
if (FLAGS_SET(flags, ND_OPT_PI_FLAG_ONLINK)) {
r = ndisc_router_process_onlink_prefix(link, rt);
else
r = ndisc_router_drop_onlink_prefix(link, rt);
if (r < 0)
return r;
if (r < 0)
return r;
}
if (FLAGS_SET(flags, ND_OPT_PI_FLAG_AUTO)) {
r = ndisc_router_process_autonomous_prefix(link, rt);