X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-link.c;h=3c6c757722a0d5203e8485a36918fc93b590d625;hp=078301aa266a494f145b290692bddf023d9b445c;hb=6f4dedb250f2d607eceefaa491f338becbeee7c0;hpb=0dd25fb9f005d8ab7ac4bc10a609d00569f8c56a diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 078301aa2..3c6c75772 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -22,7 +22,6 @@ #include #include "sd-network.h" -#include "dhcp-lease-internal.h" #include "strv.h" #include "resolved-link.h" @@ -71,11 +70,8 @@ Link *link_free(Link *l) { dns_scope_free(l->llmnr_ipv4_scope); dns_scope_free(l->llmnr_ipv6_scope); - while (l->dhcp_dns_servers) - dns_server_free(l->dhcp_dns_servers); - - while (l->link_dns_servers) - dns_server_free(l->link_dns_servers); + while (l->dns_servers) + dns_server_free(l->dns_servers); free(l); return NULL; @@ -86,7 +82,7 @@ static void link_allocate_scopes(Link *l) { assert(l); - if (l->link_dns_servers || l->dhcp_dns_servers) { + if (l->dns_servers) { if (!l->unicast_scope) { r = dns_scope_new(l->manager, &l->unicast_scope, l, DNS_PROTOCOL_DNS, AF_UNSPEC); if (r < 0) @@ -136,115 +132,48 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) { return 0; } -static int link_update_dhcp_dns_servers(Link *l) { - _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL; - const struct in_addr *nameservers = NULL; - DnsServer *s, *nx; - int r, n, i; - - assert(l); - - r = sd_network_dhcp_use_dns(l->ifindex); - if (r <= 0) - goto clear; - - r = sd_network_get_dhcp_lease(l->ifindex, &lease); - if (r < 0) - goto clear; - - LIST_FOREACH(servers, s, l->dhcp_dns_servers) - s->marked = true; - - n = sd_dhcp_lease_get_dns(lease, &nameservers); - if (n < 0) { - r = n; - goto clear; - } - - for (i = 0; i < n; i++) { - union in_addr_union a = { .in = nameservers[i] }; - - s = link_find_dns_server(l, DNS_SERVER_DHCP, AF_INET, &a); - if (s) - s->marked = false; - else { - r = dns_server_new(l->manager, NULL, DNS_SERVER_DHCP, l, AF_INET, &a); - if (r < 0) - goto clear; - } - } - - LIST_FOREACH_SAFE(servers, s, nx, l->dhcp_dns_servers) - if (s->marked) - dns_server_free(s); - - return 0; - -clear: - while (l->dhcp_dns_servers) - dns_server_free(l->dhcp_dns_servers); - - return r; -} - -static int link_update_link_dns_servers(Link *l) { - _cleanup_free_ struct in_addr *nameservers = NULL; - _cleanup_free_ struct in6_addr *nameservers6 = NULL; +static int link_update_dns_servers(Link *l) { + _cleanup_strv_free_ char **nameservers = NULL; + char **nameserver; DnsServer *s, *nx; - int r, n, i; + int r; assert(l); - LIST_FOREACH(servers, s, l->link_dns_servers) + LIST_FOREACH(servers, s, l->dns_servers) s->marked = true; - n = sd_network_get_dns(l->ifindex, &nameservers); - if (n < 0) { - r = n; + r = sd_network_get_dns(l->ifindex, &nameservers); + if (r < 0) goto clear; - } - - for (i = 0; i < n; i++) { - union in_addr_union a = { .in = nameservers[i] }; - - s = link_find_dns_server(l, DNS_SERVER_LINK, AF_INET, &a); - if (s) - s->marked = false; - else { - r = dns_server_new(l->manager, NULL, DNS_SERVER_LINK, l, AF_INET, &a); - if (r < 0) - goto clear; - } - } - n = sd_network_get_dns6(l->ifindex, &nameservers6); - if (n < 0) { - r = n; - goto clear; - } + STRV_FOREACH(nameserver, nameservers) { + union in_addr_union a; + int family; - for (i = 0; i < n; i++) { - union in_addr_union a = { .in6 = nameservers6[i] }; + r = in_addr_from_string_auto(*nameserver, &family, &a); + if (r < 0) + goto clear; - s = link_find_dns_server(l, DNS_SERVER_LINK, AF_INET6, &a); + s = link_find_dns_server(l, family, &a); if (s) s->marked = false; else { - r = dns_server_new(l->manager, NULL, DNS_SERVER_LINK, l, AF_INET6, &a); + r = dns_server_new(l->manager, NULL, l, family, &a); if (r < 0) goto clear; } } - LIST_FOREACH_SAFE(servers, s, nx, l->link_dns_servers) + LIST_FOREACH_SAFE(servers, s, nx, l->dns_servers) if (s->marked) dns_server_free(s); return 0; clear: - while (l->link_dns_servers) - dns_server_free(l->link_dns_servers); + while (l->dns_servers) + dns_server_free(l->dns_servers); return r; } @@ -252,8 +181,7 @@ clear: int link_update_monitor(Link *l) { assert(l); - link_update_dhcp_dns_servers(l); - link_update_link_dns_servers(l); + link_update_dns_servers(l); link_allocate_scopes(l); return 0; @@ -294,14 +222,12 @@ LinkAddress *link_find_address(Link *l, int family, union in_addr_union *in_addr return NULL; } -DnsServer* link_find_dns_server(Link *l, DnsServerSource source, int family, union in_addr_union *in_addr) { - DnsServer *first, *s; +DnsServer* link_find_dns_server(Link *l, int family, union in_addr_union *in_addr) { + DnsServer *s; assert(l); - first = source == DNS_SERVER_DHCP ? l->dhcp_dns_servers : l->link_dns_servers; - - LIST_FOREACH(servers, s, first) + LIST_FOREACH(servers, s, l->dns_servers) if (s->family == family && in_addr_equal(family, &s->address, in_addr)) return s; @@ -312,9 +238,7 @@ DnsServer *link_get_dns_server(Link *l) { assert(l); if (!l->current_dns_server) - l->current_dns_server = l->link_dns_servers; - if (!l->current_dns_server) - l->current_dns_server = l->dhcp_dns_servers; + l->current_dns_server = l->dns_servers; return l->current_dns_server; } @@ -325,13 +249,7 @@ void link_next_dns_server(Link *l) { /* Switch to the next DNS server */ if (!l->current_dns_server) { - l->current_dns_server = l->link_dns_servers; - if (l->current_dns_server) - return; - } - - if (!l->current_dns_server) { - l->current_dns_server = l->dhcp_dns_servers; + l->current_dns_server = l->dns_servers; if (l->current_dns_server) return; } @@ -344,12 +262,7 @@ void link_next_dns_server(Link *l) { return; } - if (l->current_dns_server->source == DNS_SERVER_LINK) - l->current_dns_server = l->dhcp_dns_servers; - else { - assert(l->current_dns_server->source == DNS_SERVER_DHCP); - l->current_dns_server = l->link_dns_servers; - } + l->current_dns_server = l->dns_servers; } int link_address_new(Link *l, LinkAddress **ret, int family, union in_addr_union *in_addr) {