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

network: merge manager_drop_routes() and manager_drop_foreign_routes()

Browse Source
This commit is contained in:
Yu Watanabe 2020-10-28 21:16:22 +09:00
parent 167a5561cd
commit 4055ec9323
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,7 +787,7 @@ static bool link_has_route(const Link *link, const Route *route) {
return false; return false;
} }
static bool links_have_route(Manager *manager, const Route *route, const Link *except) { static bool links_have_route(const Manager *manager, const Route *route, const Link *except) {
Link *link; Link *link;
assert(manager); assert(manager);
@ -803,19 +803,21 @@ static bool links_have_route(Manager *manager, const Route *route, const Link *e
return false; return false;
} }
static int manager_drop_foreign_routes(Manager *manager) { static int manager_drop_routes_internal(Manager *manager, bool foreign, const Link *except) {
Route *route; Route *route;
int k, r = 0; int k, r = 0;
Set *routes;
assert(manager); assert(manager);
SET_FOREACH(route, manager->routes_foreign) { routes = foreign ? manager->routes_foreign : manager->routes;
/* do not touch routes managed by the kernel */ SET_FOREACH(route, routes) {
/* Do not touch routes managed by the kernel */
if (route->protocol == RTPROT_KERNEL) if (route->protocol == RTPROT_KERNEL)
continue; continue;
if (links_have_route(manager, route, NULL)) /* The route will be configured later, or already configured by a link */
/* The route will be configured later. */ if (links_have_route(manager, route, except))
continue; continue;
/* The existing links do not have the route. Let's drop this now. It may by /* The existing links do not have the route. Let's drop this now. It may by
@ -828,29 +830,12 @@ static int manager_drop_foreign_routes(Manager *manager) {
return r; return r;
} }
static int manager_drop_routes(Manager *manager, Link *except) { static int manager_drop_foreign_routes(Manager *manager) {
Route *route; return manager_drop_routes_internal(manager, true, NULL);
int k, r = 0; }
assert(manager); static int manager_drop_routes(Manager *manager, const Link *except) {
return manager_drop_routes_internal(manager, false, except);
SET_FOREACH(route, manager->routes) {
/* do not touch routes managed by the kernel */
if (route->protocol == RTPROT_KERNEL)
continue;
if (links_have_route(manager, route, except))
/* The route will be configured later. */
continue;
/* The existing links do not have the route. Let's drop this now. It may by
* re-configured later. */
k = route_remove(route, manager, NULL, NULL);
if (k < 0 && r >= 0)
r = k;
}
return r;
} }
int link_drop_foreign_routes(Link *link) { int link_drop_foreign_routes(Link *link) {