X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-manager.c;h=1b6dc8a4a3a685c7de188a0113a3d4f609db9faf;hb=23432a1c249b9c513e438bffe9778a7ce2ee74fe;hp=6987c29e072574c6cb087fb70395e932c638ac71;hpb=eb60f9cd4e93ff5016dc1b5486fd1b7e1565fd92;p=elogind.git diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 6987c29e0..1b6dc8a4a 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -33,9 +33,12 @@ #include "conf-parser.h" #include "socket-util.h" #include "af-list.h" -#include "resolved.h" #include "utf8.h" + #include "resolved-dns-domain.h" +#include "resolved-conf.h" +#include "resolved-bus.h" +#include "resolved-manager.h" #define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC) @@ -181,7 +184,6 @@ fail: return 0; } - static int manager_rtnl_listen(Manager *m) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; sd_rtnl_message *i; @@ -305,87 +307,6 @@ static int manager_network_monitor_listen(Manager *m) { return 0; } -static int parse_dns_server_string(Manager *m, const char *string) { - const char *word, *state; - size_t length; - int r; - - assert(m); - assert(string); - - FOREACH_WORD_QUOTED(word, length, string, state) { - char buffer[length+1]; - int family; - union in_addr_union addr; - - memcpy(buffer, word, length); - buffer[length] = 0; - - r = in_addr_from_string_auto(buffer, &family, &addr); - if (r < 0) { - log_warning("Ignoring invalid DNS address '%s'", buffer); - continue; - } - - /* filter out duplicates */ - if (manager_find_dns_server(m, family, &addr)) - continue; - - r = dns_server_new(m, NULL, NULL, family, &addr); - if (r < 0) - return r; - } - /* do not warn about state here, since probably systemd already did */ - - return 0; -} - -int config_parse_dnsv( - const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - - Manager *m = userdata; - int r; - - assert(filename); - assert(lvalue); - assert(rvalue); - assert(m); - - /* Empty assignment means clear the list */ - if (isempty(rvalue)) { - while (m->dns_servers) - dns_server_free(m->dns_servers); - - return 0; - } - - r = parse_dns_server_string(m, rvalue); - if (r < 0) { - log_error("Failed to parse DNS server string"); - return r; - } - - return 0; -} - -int manager_parse_config_file(Manager *m) { - assert(m); - - return config_parse(NULL, "/etc/systemd/resolved.conf", NULL, - "Resolve\0", - config_item_perf_lookup, resolved_gperf_lookup, - false, false, true, m); -} - static int determine_hostname(char **ret) { _cleanup_free_ char *h = NULL, *n = NULL; int r; @@ -438,7 +359,6 @@ static int on_hostname_change(sd_event_source *es, int fd, uint32_t revents, voi } static int manager_watch_hostname(Manager *m) { - _cleanup_free_ char *h = NULL; int r; assert(m); @@ -487,9 +407,10 @@ int manager_new(Manager **ret) { m->llmnr_ipv4_tcp_fd = m->llmnr_ipv6_tcp_fd = -1; m->hostname_fd = -1; - m->use_llmnr = true; + m->llmnr_support = SUPPORT_YES; + m->read_resolv_conf = true; - r = parse_dns_server_string(m, DNS_SERVERS); + r = manager_parse_dns_server(m, DNS_SERVER_FALLBACK, DNS_SERVERS); if (r < 0) return r; @@ -560,6 +481,8 @@ Manager *manager_free(Manager *m) { while (m->dns_servers) dns_server_free(m->dns_servers); + while (m->fallback_dns_servers) + dns_server_free(m->fallback_dns_servers); sd_event_source_unref(m->network_event_source); sd_network_monitor_unref(m->network_monitor); @@ -596,6 +519,110 @@ Manager *manager_free(Manager *m) { return NULL; } +int manager_read_resolv_conf(Manager *m) { + _cleanup_fclose_ FILE *f = NULL; + struct stat st, own; + char line[LINE_MAX]; + DnsServer *s, *nx; + usec_t t; + int r; + + assert(m); + + /* Reads the system /etc/resolv.conf, if it exists and is not + * symlinked to our own resolv.conf instance */ + + if (!m->read_resolv_conf) + return 0; + + r = stat("/etc/resolv.conf", &st); + if (r < 0) { + if (errno != ENOENT) + log_warning("Failed to open /etc/resolv.conf: %m"); + r = -errno; + goto clear; + } + + /* Have we already seen the file? */ + t = timespec_load(&st.st_mtim); + if (t == m->resolv_conf_mtime) + return 0; + + m->resolv_conf_mtime = t; + + /* Is it symlinked to our own file? */ + if (stat("/run/systemd/resolve/resolv.conf", &own) >= 0 && + st.st_dev == own.st_dev && + st.st_ino == own.st_ino) { + r = 0; + goto clear; + } + + f = fopen("/etc/resolv.conf", "re"); + if (!f) { + if (errno != ENOENT) + log_warning("Failed to open /etc/resolv.conf: %m"); + r = -errno; + goto clear; + } + + if (fstat(fileno(f), &st) < 0) { + log_error("Failed to stat open file: %m"); + r = -errno; + goto clear; + } + + LIST_FOREACH(servers, s, m->dns_servers) + s->marked = true; + + FOREACH_LINE(line, f, r = -errno; goto clear) { + union in_addr_union address; + int family; + char *l; + const char *a; + + truncate_nl(line); + + l = strstrip(line); + if (*l == '#' || *l == ';') + continue; + + a = first_word(l, "nameserver"); + if (!a) + continue; + + r = in_addr_from_string_auto(a, &family, &address); + if (r < 0) { + log_warning("Failed to parse name server %s.", a); + continue; + } + + LIST_FOREACH(servers, s, m->dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, &address) > 0) + break; + + if (s) + s->marked = false; + else { + r = dns_server_new(m, NULL, DNS_SERVER_SYSTEM, NULL, family, &address); + if (r < 0) + goto clear; + } + } + + LIST_FOREACH_SAFE(servers, s, nx, m->dns_servers) + if (s->marked) + dns_server_free(s); + + return 0; + +clear: + while (m->dns_servers) + dns_server_free(m->dns_servers); + + return r; +} + static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { _cleanup_free_ char *t = NULL; int r; @@ -605,8 +632,8 @@ static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { assert(count); r = in_addr_to_string(s->family, &s->address, &t); - if (r < 0) { - log_warning("Invalid DNS address. Ignoring."); + if (r < 0) { + log_warning("Invalid DNS address. Ignoring: %s", strerror(-r)); return; } @@ -618,7 +645,7 @@ static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { } int manager_write_resolv_conf(Manager *m) { - const char *path = "/run/systemd/resolve/resolv.conf"; + static const char path[] = "/run/systemd/resolve/resolv.conf"; _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; unsigned count = 0; @@ -629,6 +656,9 @@ int manager_write_resolv_conf(Manager *m) { assert(m); + /* Read the system /etc/resolv.conf first */ + manager_read_resolv_conf(m); + r = fopen_temporary(path, &f, &temp_path); if (r < 0) return r; @@ -641,12 +671,17 @@ int manager_write_resolv_conf(Manager *m) { "# resolv.conf(5) in a different way, replace the symlink by a\n" "# static file or a different symlink.\n\n", f); + LIST_FOREACH(servers, s, m->dns_servers) + write_resolve_conf_server(s, f, &count); + HASHMAP_FOREACH(l, m->links, i) LIST_FOREACH(servers, s, l->dns_servers) write_resolve_conf_server(s, f, &count); - LIST_FOREACH(servers, s, m->dns_servers) - write_resolve_conf_server(s, f, &count); + if (count == 0) { + LIST_FOREACH(servers, s, m->fallback_dns_servers) + write_resolve_conf_server(s, f, &count); + } r = fflush_and_check(f); if (r < 0) @@ -1023,21 +1058,65 @@ DnsServer* manager_find_dns_server(Manager *m, int family, const union in_addr_u assert(m); assert(in_addr); - LIST_FOREACH(servers, s, m->dns_servers) { + LIST_FOREACH(servers, s, m->dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0) + return s; - if (s->family == family && - in_addr_equal(family, &s->address, in_addr)) + LIST_FOREACH(servers, s, m->fallback_dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0) return s; - } return NULL; } +DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) { + assert(m); + + if (m->current_dns_server == s) + return s; + + if (s) { + _cleanup_free_ char *ip = NULL; + + in_addr_to_string(s->family, &s->address, &ip); + log_info("Switching to system DNS server %s.", strna(ip)); + } + + m->current_dns_server = s; + + if (m->unicast_scope) + dns_cache_flush(&m->unicast_scope->cache); + + return s; +} + DnsServer *manager_get_dns_server(Manager *m) { + Link *l; assert(m); + /* Try to read updates resolv.conf */ + manager_read_resolv_conf(m); + if (!m->current_dns_server) - m->current_dns_server = m->dns_servers; + manager_set_dns_server(m, m->dns_servers); + + if (!m->current_dns_server) { + bool found = false; + Iterator i; + + /* No DNS servers configured, let's see if there are + * any on any links. If not, we use the fallback + * servers */ + + HASHMAP_FOREACH(l, m->links, i) + if (l->dns_servers) { + found = true; + break; + } + + if (!found) + manager_set_dns_server(m, m->fallback_dns_servers); + } return m->current_dns_server; } @@ -1045,20 +1124,23 @@ DnsServer *manager_get_dns_server(Manager *m) { void manager_next_dns_server(Manager *m) { assert(m); - if (!m->current_dns_server) { - m->current_dns_server = m->dns_servers; - return; - } - + /* If there's currently no DNS server set, then the next + * manager_get_dns_server() will find one */ if (!m->current_dns_server) return; + /* Change to the next one */ if (m->current_dns_server->servers_next) { - m->current_dns_server = m->current_dns_server->servers_next; + manager_set_dns_server(m, m->current_dns_server->servers_next); return; } - m->current_dns_server = m->dns_servers; + /* If there was no next one, then start from the beginning of + * the list */ + if (m->current_dns_server->type == DNS_SERVER_FALLBACK) + manager_set_dns_server(m, m->fallback_dns_servers); + else + manager_set_dns_server(m, m->dns_servers); } uint32_t manager_find_mtu(Manager *m) { @@ -1494,7 +1576,7 @@ int manager_find_ifindex(Manager *m, int family, const union in_addr_union *in_a assert(m); - a = manager_find_address(m, family, in_addr); + a = manager_find_link_address(m, family, in_addr); if (a) return a->link->ifindex; @@ -1551,7 +1633,7 @@ int manager_next_hostname(Manager *m) { return 0; } -LinkAddress* manager_find_address(Manager *m, int family, const union in_addr_union *in_addr) { +LinkAddress* manager_find_link_address(Manager *m, int family, const union in_addr_union *in_addr) { Iterator i; Link *l; @@ -1572,5 +1654,12 @@ int manager_our_packet(Manager *m, DnsPacket *p) { assert(m); assert(p); - return !!manager_find_address(m, p->family, &p->sender); + return !!manager_find_link_address(m, p->family, &p->sender); } + +static const char* const support_table[_SUPPORT_MAX] = { + [SUPPORT_NO] = "no", + [SUPPORT_YES] = "yes", + [SUPPORT_RESOLVE] = "resolve", +}; +DEFINE_STRING_TABLE_LOOKUP(support, Support);