shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #19898 from yuwata/network-multipath-route-without-interface-name

Browse Source 
network: set link ifindex when multi-path routes specified without interface name
This commit is contained in:
Luca Boccassi 2021-06-14 14:27:50 +01:00 committed by GitHub
commit 2fbb5df8e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -963,7 +963,9 @@ static int route_set_netlink_message(const Route *route, sd_netlink_message *req
return log_link_error_errno(link, r, "Could not append RTA_TABLE attribute: %m");
}
if (!route_type_is_reject(route) && route->nexthop_id == 0) {
if (!route_type_is_reject(route) &&
route->nexthop_id == 0 &&
ordered_set_isempty(route->multipath_routes)) {
assert(link); /* Those routes must be attached to a specific link */
r = sd_netlink_message_append_u32(req, RTA_OIF, link->ifindex);
@ -1354,7 +1356,7 @@ static int route_add_and_setup_timer(Link *link, const Route *route, unsigned *r
return 0;
}
static int append_nexthop_one(const Route *route, const MultipathRoute *m, struct rtattr **rta, size_t offset) {
static int append_nexthop_one(const Link *link, const Route *route, const MultipathRoute *m, struct rtattr **rta, size_t offset) {
struct rtnexthop *rtnh;
struct rtattr *new_rta;
int r;
@ -1372,7 +1374,7 @@ static int append_nexthop_one(const Route *route, const MultipathRoute *m, struc
rtnh = (struct rtnexthop *)((uint8_t *) *rta + offset);
*rtnh = (struct rtnexthop) {
.rtnh_len = sizeof(*rtnh),
.rtnh_ifindex = m->ifindex,
.rtnh_ifindex = m->ifindex > 0 ? m->ifindex : link->ifindex,
.rtnh_hops = m->weight,
};
@ -1399,13 +1401,17 @@ clear:
return r;
}
static int append_nexthops(const Route *route, sd_netlink_message *req) {
static int append_nexthops(const Link *link, const Route *route, sd_netlink_message *req) {
_cleanup_free_ struct rtattr *rta = NULL;
struct rtnexthop *rtnh;
MultipathRoute *m;
size_t offset;
int r;
assert(link);
assert(route);
assert(req);
if (ordered_set_isempty(route->multipath_routes))
return 0;
@ -1420,7 +1426,7 @@ static int append_nexthops(const Route *route, sd_netlink_message *req) {
offset = (uint8_t *) RTA_DATA(rta) - (uint8_t *) rta;
ORDERED_SET_FOREACH(m, route->multipath_routes) {
r = append_nexthop_one(route, m, &rta, offset);
r = append_nexthop_one(link, route, m, &rta, offset);
if (r < 0)
return r;
@ -1557,7 +1563,7 @@ static int route_configure(
assert(route->nexthop_id == 0);
assert(!in_addr_is_set(route->gw_family, &route->gw));
r = append_nexthops(route, req);
r = append_nexthops(link, route, req);
if (r < 0)
return log_link_error_errno(link, r, "Could not append RTA_MULTIPATH attribute: %m");
}

4
test/test-network/conf/25-route-static.network
View File

@ -82,8 +82,8 @@ Destination=149.10.123.4
[Route]
Destination=192.168.10.1/32
MultiPathRoute=149.10.124.59@dummy98 10
MultiPathRoute=149.10.124.60@dummy98 5
MultiPathRoute=149.10.124.59 10
MultiPathRoute=149.10.124.60 5
[Route]
Destination=2001:1234:5:7fff:ff:ff:ff:ff/128