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

network: dhcp4: split and rename link_set_dns_routes()

Browse Source
This commit is contained in:
Yu Watanabe
2021-04-27 00:01:18 +09:00
parent 7057030610
commit 949b2c95c9
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-dhcp4.c
+34 -17
View File
@@ -487,26 +487,21 @@ static int link_set_dhcp_gateway(Link *link, struct in_addr *ret_gw) {
return 0;
}
static int link_set_dns_routes(Link *link, const struct in_addr *gw) {
static int link_set_routes_to_servers(
Link *link,
const struct in_addr *servers,
size_t n_servers,
const struct in_addr *gw) {
_cleanup_(route_freep) Route *route = NULL;
const struct in_addr *dns;
int n, r;
int r;
assert(link);
assert(link->dhcp_lease);
assert(link->network);
assert(servers || n_servers == 0);
assert(gw);
if (!link->network->dhcp_use_dns ||
!link->network->dhcp_routes_to_dns)
return 0;
n = sd_dhcp_lease_get_dns(link->dhcp_lease, &dns);
if (IN_SET(n, 0, -ENODATA))
return 0;
if (n < 0)
return n;
r = route_new(&route);
if (r < 0)
return r;
@@ -518,11 +513,11 @@ static int link_set_dns_routes(Link *link, const struct in_addr *gw) {
route->table = link_get_dhcp_route_table(link);
route->mtu = link->network->dhcp_route_mtu;
for (int i = 0; i < n; i ++) {
if (in4_addr_is_null(&dns[i]))
for (size_t i = 0; i < n_servers; i++) {
if (in4_addr_is_null(&servers[i]))
continue;
route->dst.in = dns[i];
route->dst.in = servers[i];
r = dhcp_route_configure_auto(route, link, gw);
if (r < 0)
@@ -532,6 +527,28 @@ static int link_set_dns_routes(Link *link, const struct in_addr *gw) {
return 0;
}
static int link_set_routes_to_dns(Link *link, const struct in_addr *gw) {
const struct in_addr *dns;
int r;
assert(link);
assert(link->dhcp_lease);
assert(link->network);
assert(gw);
if (!link->network->dhcp_use_dns ||
!link->network->dhcp_routes_to_dns)
return 0;
r = sd_dhcp_lease_get_dns(link->dhcp_lease, &dns);
if (IN_SET(r, 0, -ENODATA))
return 0;
if (r < 0)
return r;
return link_set_routes_to_servers(link, dns, r, gw);
}
static int link_set_dhcp_routes(Link *link) {
struct in_addr gw = {};
Route *rt;
@@ -571,7 +588,7 @@ static int link_set_dhcp_routes(Link *link) {
return log_link_error_errno(link, r, "DHCP error: Could not set gateway: %m");
}
r = link_set_dns_routes(link, &gw);
r = link_set_routes_to_dns(link, &gw);
if (r < 0)
return log_link_error_errno(link, r, "DHCP error: Could not set routes to DNS servers: %m");