SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network/dhcp4: make dhcp4_request_route_to_gateway() take Route object

Browse Source 
No functional change, preparation for later commits.
This commit is contained in:
Yu Watanabe
2025-01-27 06:29:26 +09:00
parent e92f40c6b0
commit c9ee0d2eeb
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp4.c
+22 -17
View File
@@ -438,14 +438,19 @@ static int dhcp4_request_prefix_route(Link *link) {
return dhcp4_request_route(route, link);
}
static int dhcp4_request_route_to_gateway(Link *link, const struct in_addr *gw) {
static int dhcp4_request_route_to_gateway(Link *link, const Route *rt) {
_cleanup_(route_unrefp) Route *route = NULL;
struct in_addr address;
int r;
assert(link);
assert(link->dhcp_lease);
assert(gw);
assert(rt);
if (in_addr_is_set(rt->nexthop.family, &rt->nexthop.gw) <= 0)
return 0;
assert(rt->nexthop.family == AF_INET);
r = sd_dhcp_lease_get_address(link->dhcp_lease, &address);
if (r < 0)
@@ -455,7 +460,7 @@ static int dhcp4_request_route_to_gateway(Link *link, const struct in_addr *gw)
if (r < 0)
return r;
route->dst.in = *gw;
route->dst.in = rt->nexthop.gw.in;
route->dst_prefixlen = 32;
route->prefsrc.in = address;
route->scope = RT_SCOPE_LINK;
@@ -526,14 +531,14 @@ static int dhcp4_request_route_auto(
route->prefsrc.in = address;
} else {
r = dhcp4_request_route_to_gateway(link, gw);
if (r < 0)
return r;
route->scope = RT_SCOPE_UNIVERSE;
route->nexthop.family = AF_INET;
route->nexthop.gw.in = *gw;
route->prefsrc.in = address;
r = dhcp4_request_route_to_gateway(link, route);
if (r < 0)
return r;
}
return dhcp4_request_route(route, link);
@@ -613,12 +618,6 @@ static int dhcp4_request_default_gateway(Link *link) {
if (r < 0)
return r;
/* The dhcp netmask may mask out the gateway. First, add an explicit route for the gateway host
* so that we can route no matter the netmask or existing kernel route tables. */
r = dhcp4_request_route_to_gateway(link, &router);
if (r < 0)
return r;
r = route_new(&route);
if (r < 0)
return r;
@@ -628,6 +627,12 @@ static int dhcp4_request_default_gateway(Link *link) {
route->nexthop.gw.in = router;
route->prefsrc.in = address;
/* The dhcp netmask may mask out the gateway. First, add an explicit route for the gateway host
* so that we can route no matter the netmask or existing kernel route tables. */
r = dhcp4_request_route_to_gateway(link, route);
if (r < 0)
return r;
return dhcp4_request_route(route, link);
}
@@ -664,16 +669,16 @@ static int dhcp4_request_semi_static_routes(Link *link) {
continue;
}
r = dhcp4_request_route_to_gateway(link, &gw);
if (r < 0)
return r;
r = route_dup(rt, NULL, &route);
if (r < 0)
return r;
route->nexthop.gw.in = gw;
r = dhcp4_request_route_to_gateway(link, route);
if (r < 0)
return r;
r = dhcp4_request_route(route, link);
if (r < 0)
return r;