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

network/route: introduce route_get_request()

Browse Source 
No functional change, just refactoring and preparation for later
commits.
This commit is contained in:
Yu Watanabe
2024-01-19 10:23:14 +09:00
parent 2f542fc3d4
commit 3babbdf632
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-route.c
+27 -16
View File
@@ -336,6 +336,29 @@ static int route_get_link(Manager *manager, const Route *route, Link **ret) {
return route_nexthop_get_link(manager, NULL, &route->nexthop, ret);
}
static int route_get_request(Link *link, const Route *route, Request **ret) {
Request *req;
assert(link);
assert(link->manager);
assert(route);
req = ordered_set_get(link->manager->request_queue,
&(const Request) {
.link = link,
.type = REQUEST_TYPE_ROUTE,
.userdata = (void*) route,
.hash_func = (hash_func_t) route_hash_func,
.compare_func = (compare_func_t) route_compare_func,
});
if (!req)
return -ENOENT;
if (ret)
*ret = req;
return 0;
}
int route_dup(const Route *src, const RouteNextHop *nh, Route **ret) {
_cleanup_(route_freep) Route *dest = NULL;
int r;
@@ -1348,29 +1371,17 @@ int link_request_static_routes(Link *link, bool only_ipv4) {
}
void route_cancel_request(Route *route, Link *link) {
Request *req;
assert(route);
link = route->link ?: link;
assert(link);
assert(link->manager);
link = ASSERT_PTR(route->link ?: link);
if (!route_is_requesting(route))
return;
req = ordered_set_get(link->manager->request_queue,
&(Request) {
.link = link,
.type = REQUEST_TYPE_ROUTE,
.userdata = route,
.hash_func = (hash_func_t) route_hash_func,
.compare_func = (compare_func_t) route_compare_func,
});
if (req)
Request *req;
if (route_get_request(link, route, &req) >= 0)
request_detach(req);
route_cancel_requesting(route);
}