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

network/dhcp4: use sd_dhcp_lease_get_prefix()

Browse Source
This commit is contained in:
Yu Watanabe
2023-07-28 05:15:11 +09:00
parent 33acdc511c
commit 2faf2e2a42
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp4.c
+11 -17
View File
@@ -220,7 +220,6 @@ static bool link_prefixroute(Link *link) {
static int dhcp4_request_prefix_route(Link *link) {
_cleanup_(route_freep) Route *route = NULL;
struct in_addr address, netmask;
int r;
assert(link);
@@ -230,23 +229,20 @@ static int dhcp4_request_prefix_route(Link *link) {
/* When true, the route will be created by kernel. See dhcp4_update_address(). */
return 0;
r = sd_dhcp_lease_get_address(link->dhcp_lease, &address);
if (r < 0)
return r;
r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
if (r < 0)
return r;
r = route_new(&route);
if (r < 0)
return r;
route->dst.in.s_addr = address.s_addr & netmask.s_addr;
route->dst_prefixlen = in4_addr_netmask_to_prefixlen(&netmask);
route->prefsrc.in = address;
route->scope = RT_SCOPE_LINK;
r = sd_dhcp_lease_get_prefix(link->dhcp_lease, &route->dst.in, &route->dst_prefixlen);
if (r < 0)
return r;
r = sd_dhcp_lease_get_address(link->dhcp_lease, &route->prefsrc.in);
if (r < 0)
return r;
return dhcp4_request_route(TAKE_PTR(route), link);
}
@@ -800,8 +796,8 @@ static int dhcp4_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Reques
static int dhcp4_request_address(Link *link, bool announce) {
_cleanup_(address_freep) Address *addr = NULL;
struct in_addr address, netmask, server;
unsigned prefixlen;
struct in_addr address, server;
uint8_t prefixlen;
Address *existing;
usec_t lifetime_usec;
int r;
@@ -815,7 +811,7 @@ static int dhcp4_request_address(Link *link, bool announce) {
if (r < 0)
return log_link_warning_errno(link, r, "DHCP error: no address: %m");
r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
r = sd_dhcp_lease_get_prefix(link->dhcp_lease, NULL, &prefixlen);
if (r < 0)
return log_link_warning_errno(link, r, "DHCP error: no netmask: %m");
@@ -836,8 +832,6 @@ static int dhcp4_request_address(Link *link, bool announce) {
} else
lifetime_usec = USEC_INFINITY;
prefixlen = in4_addr_netmask_to_prefixlen(&netmask);
if (announce) {
const struct in_addr *router;