network: route: make route_cancel_request() take Link*

yuwata · yuwata · commit 95eb38c8d0df · 2021-12-06T21:30:57.000+09:00
As the Route object may be managed by Manager.
diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
@@ -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;
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
@@ -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) {
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
@@ -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) {
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
@@ -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) {
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
@@ -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);
 
-        if (!route_is_requesting(route))
-                return;
+        link = route->link ?: link;
 
-        if (!route->link)
+        assert(link);
+
+        if (!route_is_requesting(route))
                 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);
 }
 
diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ int dhcp6_pd_remove(Link *link, bool only_marked) {`
`184`	`184`	`if (k < 0)`
`185`	`185`	`r = k;`
`186`	`186`
`187`		`- route_cancel_request(route);`
	`187`	`+ route_cancel_request(route, link);`
`188`	`188`	`}`
`189`	`189`	`} else {`
`190`	`190`	`Address *address;`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static int dhcp4_remove_address_and_routes(Link *link, bool only_marked) {`
`71`	`71`	`if (k < 0)`
`72`	`72`	`r = k;`
`73`	`73`
`74`		`- route_cancel_request(route);`
	`74`	`+ route_cancel_request(route, link);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`SET_FOREACH(address, link->addresses) {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static int dhcp6_remove(Link *link, bool only_marked) {`
`63`	`63`	`if (k < 0)`
`64`	`64`	`r = k;`
`65`	`65`
`66`		`- route_cancel_request(route);`
	`66`	`+ route_cancel_request(route, link);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`SET_FOREACH(address, link->addresses) {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static int ndisc_remove(Link link, struct in6_addr router) {`
`90`	`90`	`if (k < 0)`
`91`	`91`	`r = k;`
`92`	`92`
`93`		`- route_cancel_request(route);`
	`93`	`+ route_cancel_request(route, link);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`SET_FOREACH(address, link->addresses) {`