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

Merge pull request #21638 from yuwata/network-dhcp6pd-prefix-lost

Browse Source 
network: dhcp6pd: fix prefix lost handling
This commit is contained in:
Yu Watanabe 2021-12-07 02:54:10 +09:00 committed by GitHub
commit de1253e4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/networkd-dhcp-prefix-delegation.c
View File

@ -184,7 +184,7 @@ int dhcp6_pd_remove(Link *link, bool only_marked) {
if (k < 0)
r = k;
route_cancel_request(route);
route_cancel_request(route, link);
}
} else {
Address *address;
@ -655,6 +655,7 @@ static int dhcp6_pd_finalize(Link *link) {
}
void dhcp6_pd_prefix_lost(Link *dhcp6_link) {
Route *route;
Link *link;
int r;
@ -662,7 +663,7 @@ void dhcp6_pd_prefix_lost(Link *dhcp6_link) {
assert(dhcp6_link->manager);
HASHMAP_FOREACH(link, dhcp6_link->manager->links_by_index) {
if (link == dhcp6_link)
if (!dhcp6_pd_is_uplink(link, dhcp6_link, /* accept_auto = */ true))
continue;
r = dhcp6_pd_remove(link, /* only_marked = */ false);
@ -670,6 +671,25 @@ void dhcp6_pd_prefix_lost(Link *dhcp6_link) {
link_enter_failed(link);
}
SET_FOREACH(route, dhcp6_link->manager->routes) {
if (route->source != NETWORK_CONFIG_SOURCE_DHCP6)
continue;
if (route->family != AF_INET6)
continue;
if (route->type != RTN_UNREACHABLE)
continue;
if (!set_contains(dhcp6_link->dhcp6_pd_prefixes,
&(struct in_addr_prefix) {
.family = AF_INET6,
.prefixlen = route->dst_prefixlen,
.address = route->dst }))
continue;
(void) route_remove(route);
route_cancel_request(route, dhcp6_link);
}
set_clear(dhcp6_link->dhcp6_pd_prefixes);
}

2
src/network/networkd-dhcp4.c
View File

@ -71,7 +71,7 @@ static int dhcp4_remove_address_and_routes(Link *link, bool only_marked) {
if (k < 0)
r = k;
route_cancel_request(route);
route_cancel_request(route, link);
}
SET_FOREACH(address, link->addresses) {

2
src/network/networkd-dhcp6.c
View File

@ -63,7 +63,7 @@ static int dhcp6_remove(Link *link, bool only_marked) {
if (k < 0)
r = k;
route_cancel_request(route);
route_cancel_request(route, link);
}
SET_FOREACH(address, link->addresses) {

2
src/network/networkd-ndisc.c
View File

@ -90,7 +90,7 @@ static int ndisc_remove(Link *link, struct in6_addr *router) {
if (k < 0)
r = k;
route_cancel_request(route);
route_cancel_request(route, link);
}
SET_FOREACH(address, link->addresses) {

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

@ -1260,24 +1260,25 @@ static int route_configure(
return 0;
}
void route_cancel_request(Route *route) {
void route_cancel_request(Route *route, Link *link) {
Request req;
assert(route);
link = route->link ?: link;
assert(link);
if (!route_is_requesting(route))
return;
if (!route->link)
return;
req = (Request) {
.link = route->link,
.link = link,
.type = REQUEST_TYPE_ROUTE,
.route = route,
};
request_drop(ordered_set_get(route->link->manager->request_queue, &req));
request_drop(ordered_set_get(link->manager->request_queue, &req));
route_cancel_requesting(route);
}

2
src/network/networkd-route.h
View File

@ -86,7 +86,7 @@ int link_drop_routes(Link *link);
int link_drop_foreign_routes(Link *link);
void link_foreignize_routes(Link *link);
void route_cancel_request(Route *route);
void route_cancel_request(Route *route, Link *link);
int link_request_route(
Link *link,
Route *route,