shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

network: nexthop: IFF_UP flag is required for nexthops which attached to a link

Browse Source
This commit is contained in:
Yu Watanabe 2021-05-18 12:20:46 +09:00
parent 7b3a7581e3
commit 8031e5ca8d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/networkd-nexthop.c
View File

@ -2,6 +2,7 @@
* Copyright © 2019 VMware, Inc.
*/
#include <net/if.h>
#include <linux/nexthop.h>
#include "alloc-util.h"
@ -695,12 +696,21 @@ static bool nexthop_is_ready_to_configure(Link *link, const NextHop *nexthop) {
assert(link);
assert(nexthop);
if (!link_is_ready_to_configure(link, false))
return false;
if (nexthop->blackhole) {
if (link->manager->nexthop_remove_messages > 0)
return false;
} else {
Link *l;
/* TODO: fdb nexthop does not require IFF_UP. The condition below needs to be updated
* when fdb nexthop support is added. See rtm_to_nh_config() in net/ipv4/nexthop.c of
* kernel. */
if (!FLAGS_SET(link->flags, IFF_UP))
return false;
HASHMAP_FOREACH(l, link->manager->links) {
if (l->address_remove_messages > 0)
return false;
@ -739,9 +749,6 @@ int request_process_nexthop(Request *req) {
assert(req->nexthop);
assert(req->type == REQUEST_TYPE_NEXTHOP);
if (!link_is_ready_to_configure(req->link, false))
return 0;
if (!nexthop_is_ready_to_configure(req->link, req->nexthop))
return 0;