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

network/ndisc: restore the original preference and priority before checking if existing route can be updated

Browse Source 
Follow-up for 972f1d17ab.

This fixes the logic of removing unnecessary routes configured by the
previously received RAs. Previously, we wrongly handled existing routes
could be updated, and unexpected routes would be kept.
This commit is contained in:
Yu Watanabe
2024-11-12 18:08:25 +09:00
parent 74e0b590dd
commit e2060bc124
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-ndisc.c
+9
View File
@@ -224,6 +224,9 @@ static int ndisc_request_route(Route *route, Link *link) {
* and also an existing pending request, then the source may be updated by the request. So,
* we first need to check the source of the requested route. */
if (route_get_request(link->manager, route, &req) >= 0) {
route->pref = pref_original;
ndisc_set_route_priority(link, route);
existing = ASSERT_PTR(req->userdata);
if (!route_can_update(existing, route)) {
if (existing->source == NETWORK_CONFIG_SOURCE_STATIC) {
@@ -238,8 +241,14 @@ static int ndisc_request_route(Route *route, Link *link) {
}
}
route->pref = pref;
ndisc_set_route_priority(link, route);
/* Then, check if a conflicting route exists. */
if (route_get(link->manager, route, &existing) >= 0) {
route->pref = pref_original;
ndisc_set_route_priority(link, route);
if (!route_can_update(existing, route)) {
if (existing->source == NETWORK_CONFIG_SOURCE_STATIC) {
log_link_debug(link, "Found an existing route that conflicts with new route based on a received RA, ignoring request.");