shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

network: route: parse earlier if device specifier in MultiPathRoute= is ifindex

Browse Source
This commit is contained in:
Yu Watanabe 2021-05-14 11:58:20 +09:00
parent 0b54c87081
commit 8ed87c4983
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1575,25 +1575,23 @@ static int route_is_ready_to_configure(const Route *route, Link *link) {
ORDERED_SET_FOREACH(m, route->multipath_routes) {
union in_addr_union a = m->gateway.address;
Link *l = NULL;
if (route->gateway_onlink <= 0 &&
!manager_address_is_reachable(link->manager, m->gateway.family, &a))
return false;
if (m->ifname) {
Link *l;
r = resolve_interface(&link->manager->rtnl, m->ifname);
if (r < 0)
if (link_get_by_name(link->manager, m->ifname, &l) < 0)
return false;
m->ifindex = r;
m->ifindex = l->ifindex;
} else if (m->ifindex > 0) {
if (link_get(link->manager, m->ifindex, &l) < 0)
return false;
if (!link_is_ready_to_configure(l, true))
return false;
}
if (l && !link_is_ready_to_configure(l, true))
return false;
}
return true;
@ -2755,9 +2753,14 @@ int config_parse_multipath_route(
if (dev) {
*dev++ = '\0';
m->ifname = strdup(dev);
if (!m->ifname)
return log_oom();
r = parse_ifindex(dev);
if (r > 0)
m->ifindex = r;
else {
m->ifname = strdup(dev);
if (!m->ifname)
return log_oom();
}
}
r = in_addr_from_string_auto(word, &family, &a);