mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

network/route: fix adjustment of nexthop weight

Browse Source 
Fixes #34167.
This commit is contained in:
Yu Watanabe 2024-09-01 11:52:12 +09:00
parent db8dc7c1dd
commit c8dbf9acc1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/networkd-route.c
View File

@ -1104,9 +1104,15 @@ static int process_route_one(
route = route_ref(tmp);
is_new = true;
} else
} else {
/* Update remembered route with the received notification. */
route->nexthop.weight = tmp->nexthop.weight;
/* Here, update weight only when a non-zero weight is received. As the kernel does
* not provide the weight of a single-path route. In such case, tmp->nexthop.weight
* is zero, hence we should not overwrite the known weight of the route. */
if (tmp->nexthop.weight != 0)
route->nexthop.weight = tmp->nexthop.weight;
}
/* Also update information that cannot be obtained through netlink notification. */
if (req && req->waiting_reply) {
@ -1116,6 +1122,14 @@ static int process_route_one(
link_enter_failed(link);
return 0;
}
/* We configure IPv6 multipath route separatedly. When the first path is configured,
* the kernel does not provide the weight of the path. So, we need to adjust it here.
* Hopefully, the weight is assigned correctly. */
if (route->nexthop.weight == 0) {
Route *rt = ASSERT_PTR(req->userdata);
route->nexthop.weight = rt->nexthop.weight;
}
}
route_enter_configured(route);