morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

network/route: unconditionally call route_setup_timer() for managed routes

Browse Source 
For foreign routes, we do not set lifetime, as it is foreign.
So, this should not change any behavior. Preparation for later commits.
This commit is contained in:
Yu Watanabe
2024-01-09 13:36:22 +09:00
parent a5a0a4eb56
commit f86575ca06
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1534,7 +1534,7 @@ static int process_route_one(
_cleanup_(route_freep) Route *tmp = in;
Route *route = NULL;
bool update_dhcp4;
bool is_new = false, update_dhcp4;
int r;
assert(manager);
@@ -1549,32 +1549,35 @@ static int process_route_one(
switch (type) {
case RTM_NEWROUTE:
if (route) {
route->flags = tmp->flags;
route_enter_configured(route);
log_route_debug(route, "Received remembered", link, manager);
if (!route) {
if (!manager->manage_foreign_routes) {
route_enter_configured(tmp);
log_route_debug(tmp, "Ignoring received", link, manager);
return 0;
}
r = route_setup_timer(route, cacheinfo);
if (r < 0)
log_link_warning_errno(link, r, "Failed to configure expiration timer for route, ignoring: %m");
if (r > 0)
log_route_debug(route, "Configured expiration timer for", link, manager);
} else if (!manager->manage_foreign_routes) {
route_enter_configured(tmp);
log_route_debug(tmp, "Ignoring received", link, manager);
} else {
/* A route appeared that we did not request */
route_enter_configured(tmp);
log_route_debug(tmp, "Received new", link, manager);
/* If we do not know the route, then save it. */
r = route_add(manager, link, tmp);
if (r < 0) {
log_link_warning_errno(link, r, "Failed to remember foreign route, ignoring: %m");
return 0;
}
TAKE_PTR(tmp);
}
route = TAKE_PTR(tmp);
is_new = true;
} else
/* Update remembered route with the received notification. */
route->flags = tmp->flags;
route_enter_configured(route);
log_route_debug(route, is_new ? "Received new" : "Received remembered", link, manager);
r = route_setup_timer(route, cacheinfo);
if (r < 0)
log_link_warning_errno(link, r, "Failed to configure expiration timer for route, ignoring: %m");
if (r > 0)
log_route_debug(route, "Configured expiration timer for", link, manager);
break;