shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-10 00:58:20 +03:00
Code

network: drop routes managed by Manager when link is removed

Browse Source 
Also, foreign routes managed by Manager are dropped in
link_drop_foreign_routes().
This commit is contained in:
Yu Watanabe 2020-10-23 17:01:30 +09:00
parent 5f4d7aa458
commit 1132a714ec
1 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -761,7 +761,7 @@ int route_remove(
return 0; return 0;
} }
static bool link_is_static_route_configured(const Link *link, const Route *route) { static bool link_has_route(const Link *link, const Route *route) {
Route *net_route; Route *net_route;
assert(link); assert(link);
@ -777,11 +777,78 @@ static bool link_is_static_route_configured(const Link *link, const Route *route
return false; return false;
} }
static bool links_have_route(Manager *manager, const Route *route, const Link *except) {
Link *link;
assert(manager);
HASHMAP_FOREACH(link, manager->links) {
if (link == except)
continue;
if (link_has_route(link, route))
return true;
}
return false;
}
static int manager_drop_foreign_routes(Manager *manager) {
Route *route;
int k, r = 0;
assert(manager);
SET_FOREACH(route, manager->routes_foreign) {
/* do not touch routes managed by the kernel */
if (route->protocol == RTPROT_KERNEL)
continue;
if (links_have_route(manager, route, NULL))
/* 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;
}
static int manager_drop_routes(Manager *manager, Link *except) {
Route *route;
int k, r = 0;
assert(manager);
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) {
Route *route; Route *route;
int k, r = 0; int k, r = 0;
assert(link); assert(link);
assert(link->manager);
SET_FOREACH(route, link->routes_foreign) { SET_FOREACH(route, link->routes_foreign) {
/* do not touch routes managed by the kernel */ /* do not touch routes managed by the kernel */
@ -805,7 +872,7 @@ int link_drop_foreign_routes(Link *link) {
FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP)) FLAGS_SET(link->network->keep_configuration, KEEP_CONFIGURATION_DHCP))
continue; continue;
if (link_is_static_route_configured(link, route)) if (link_has_route(link, route))
k = route_add(NULL, link, route, NULL, NULL); k = route_add(NULL, link, route, NULL, NULL);
else else
k = route_remove(route, NULL, link, NULL); k = route_remove(route, NULL, link, NULL);
@ -813,6 +880,10 @@ int link_drop_foreign_routes(Link *link) {
r = k; r = k;
} }
k = manager_drop_foreign_routes(link->manager);
if (k < 0 && r >= 0)
r = k;
return r; return r;
} }
@ -832,6 +903,10 @@ int link_drop_routes(Link *link) {
r = k; r = k;
} }
k = manager_drop_routes(link->manager, link);
if (k < 0 && r >= 0)
r = k;
return r; return r;
} }