system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 02:05:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

network/route-nexthop: use RTA_MULTIPATH when weight is not zero

Browse source 
As we have no way to specify the weight of gateway without using
RTA_MULTIPATH.
This commit is contained in:
Yu Watanabe 2024-01-13 13:49:24 +09:00
parent 4054e8128e
commit 406fde1a4d
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/network/networkd-route-nexthop.c
View file

@ -384,9 +384,6 @@ static int netlink_message_append_multipath_route(Link *link, const Route *route
assert(route);
assert(message);
if (ordered_set_isempty(route->nexthops))
return 0;
rta = new(struct rtattr, 1);
if (!rta)
return -ENOMEM;
@ -397,16 +394,23 @@ static int netlink_message_append_multipath_route(Link *link, const Route *route
};
offset = (uint8_t *) RTA_DATA(rta) - (uint8_t *) rta;
RouteNextHop *nh;
ORDERED_SET_FOREACH(nh, route->nexthops) {
struct rtnexthop *rtnh;
r = append_nexthop_one(link, route, nh, &rta, offset);
if (ordered_set_isempty(route->nexthops)) {
r = append_nexthop_one(link, route, &route->nexthop, &rta, offset);
if (r < 0)
return r;
rtnh = (struct rtnexthop *)((uint8_t *) rta + offset);
offset = (uint8_t *) RTNH_NEXT(rtnh) - (uint8_t *) rta;
} else {
RouteNextHop *nh;
ORDERED_SET_FOREACH(nh, route->nexthops) {
struct rtnexthop *rtnh;
r = append_nexthop_one(link, route, nh, &rta, offset);
if (r < 0)
return r;
rtnh = (struct rtnexthop *)((uint8_t *) rta + offset);
offset = (uint8_t *) RTNH_NEXT(rtnh) - (uint8_t *) rta;
}
}
return sd_netlink_message_append_data(message, RTA_MULTIPATH, RTA_DATA(rta), RTA_PAYLOAD(rta));
@ -425,7 +429,9 @@ int route_nexthops_set_netlink_message(Link *link, const Route *route, sd_netlin
if (route_type_is_reject(route))
return 0;
if (ordered_set_isempty(route->nexthops)) {
/* We request IPv6 multipath routes separatedly. Even though, if weight is non-zero, we need to use
* RTA_MULTIPATH, as we have no way to specify the weight of the nexthop. */
if (ordered_set_isempty(route->nexthops) && route->nexthop.weight == 0) {
if (in_addr_is_set(route->nexthop.family, &route->nexthop.gw)) {
if (route->nexthop.family == route->family)