SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/nexthop: add several assertions related to nexthop ID

Browse Source
This commit is contained in:
Yu Watanabe
2023-12-21 04:22:46 +09:00
parent 462877f060
commit c1e0890004
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-nexthop.c
+12 -6
View File
@@ -239,6 +239,10 @@ static int nexthop_get(Link *link, const NextHop *in, NextHop **ret) {
if (in->id > 0)
return nexthop_get_by_id(link->manager, in->id, ret);
/* If ManageForeignNextHops=no, nexthop with id == 0 should be already filtered by
* nexthop_section_verify(). */
assert(link->manager->manage_foreign_nexthops);
ifindex = nexthop_bound_to_link(in) ? link->ifindex : 0;
HASHMAP_FOREACH(nexthop, link->manager->nexthops_by_id) {
@@ -287,6 +291,10 @@ static int nexthop_get_request(Link *link, const NextHop *in, Request **ret) {
if (in->id > 0)
return nexthop_get_request_by_id(link->manager, in->id, ret);
/* If ManageForeignNextHops=no, nexthop with id == 0 should be already filtered by
* nexthop_section_verify(). */
assert(link->manager->manage_foreign_nexthops);
ifindex = nexthop_bound_to_link(in) ? link->ifindex : 0;
ORDERED_SET_FOREACH(req, link->manager->request_queue) {
@@ -430,16 +438,14 @@ static int nexthop_remove(NextHop *nexthop) {
Request *req;
int r;
manager = ASSERT_PTR(ASSERT_PTR(nexthop)->manager);
assert(nexthop);
assert(nexthop->id > 0);
manager = ASSERT_PTR(nexthop->manager);
/* link may be NULL. */
(void) link_get_by_index(manager, nexthop->ifindex, &link);
if (nexthop->id == 0) {
log_link_debug(link, "Cannot remove nexthop without valid ID, ignoring.");
return 0;
}
log_nexthop_debug(nexthop, "Removing", manager);
r = sd_rtnl_message_new_nexthop(manager->rtnl, &m, RTM_DELNEXTHOP, AF_UNSPEC, RTPROT_UNSPEC);