if (r < 0)
goto fail;
+ r = link_update_monitor(l);
+ if (r < 0)
+ goto fail;
+
if (is_new)
log_debug("Found new link %i/%s", ifindex, l->name);
return 0;
}
-
static int manager_rtnl_listen(Manager *m) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
sd_rtnl_message *i;
}
static int manager_watch_hostname(Manager *m) {
- _cleanup_free_ char *h = NULL;
int r;
assert(m);
return 0;
}
+static void manager_llmnr_stop(Manager *m) {
+ assert(m);
+
+ m->llmnr_ipv4_udp_event_source = sd_event_source_unref(m->llmnr_ipv4_udp_event_source);
+ m->llmnr_ipv4_udp_fd = safe_close(m->llmnr_ipv4_udp_fd);
+
+ m->llmnr_ipv6_udp_event_source = sd_event_source_unref(m->llmnr_ipv6_udp_event_source);
+ m->llmnr_ipv6_udp_fd = safe_close(m->llmnr_ipv6_udp_fd);
+
+ m->llmnr_ipv4_tcp_event_source = sd_event_source_unref(m->llmnr_ipv4_tcp_event_source);
+ m->llmnr_ipv4_tcp_fd = safe_close(m->llmnr_ipv4_tcp_fd);
+
+ m->llmnr_ipv6_tcp_event_source = sd_event_source_unref(m->llmnr_ipv6_tcp_event_source);
+ m->llmnr_ipv6_tcp_fd = safe_close(m->llmnr_ipv6_tcp_fd);
+}
+
+static int manager_llmnr_start(Manager *m) {
+ int r;
+
+ assert(m);
+
+ if (m->llmnr_support == SUPPORT_NO)
+ return 0;
+
+ r = manager_llmnr_ipv4_udp_fd(m);
+ if (r == -EADDRINUSE)
+ goto eaddrinuse;
+ if (r < 0)
+ return r;
+
+ r = manager_llmnr_ipv6_udp_fd(m);
+ if (r == -EADDRINUSE)
+ goto eaddrinuse;
+ if (r < 0)
+ return r;
+
+ r = manager_llmnr_ipv4_tcp_fd(m);
+ if (r == -EADDRINUSE)
+ goto eaddrinuse;
+ if (r < 0)
+ return r;
+
+ r = manager_llmnr_ipv6_tcp_fd(m);
+ if (r == -EADDRINUSE)
+ goto eaddrinuse;
+ if (r < 0)
+ return r;
+
+ return 0;
+
+eaddrinuse:
+ log_warning("There appears to be another LLMNR respondering running. Turning off LLMNR support.");
+ m->llmnr_support = SUPPORT_NO;
+ manager_llmnr_stop(m);
+ return 0;
+}
+
int manager_new(Manager **ret) {
_cleanup_(manager_freep) Manager *m = NULL;
int r;
m->hostname_fd = -1;
m->llmnr_support = SUPPORT_YES;
+ m->read_resolv_conf = true;
r = manager_parse_dns_server(m, DNS_SERVER_FALLBACK, DNS_SERVERS);
if (r < 0)
if (r < 0)
return r;
- r = manager_llmnr_ipv4_udp_fd(m);
- if (r < 0)
- return r;
- r = manager_llmnr_ipv6_udp_fd(m);
- if (r < 0)
- return r;
- r = manager_llmnr_ipv4_tcp_fd(m);
- if (r < 0)
- return r;
- r = manager_llmnr_ipv6_tcp_fd(m);
- if (r < 0)
- return r;
-
*ret = m;
m = NULL;
return 0;
}
+int manager_start(Manager *m) {
+ int r;
+
+ assert(m);
+
+ r = manager_llmnr_start(m);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
Manager *manager_free(Manager *m) {
Link *l;
if (!m)
return NULL;
- while (m->dns_queries)
- dns_query_free(m->dns_queries);
-
- hashmap_free(m->dns_transactions);
-
while ((l = hashmap_first(m->links)))
link_free(l);
- hashmap_free(m->links);
+
+ while (m->dns_queries)
+ dns_query_free(m->dns_queries);
dns_scope_free(m->unicast_scope);
while (m->fallback_dns_servers)
dns_server_free(m->fallback_dns_servers);
+ hashmap_free(m->links);
+ hashmap_free(m->dns_transactions);
+
sd_event_source_unref(m->network_event_source);
sd_network_monitor_unref(m->network_monitor);
safe_close(m->dns_ipv4_fd);
safe_close(m->dns_ipv6_fd);
- sd_event_source_unref(m->llmnr_ipv4_udp_event_source);
- sd_event_source_unref(m->llmnr_ipv6_udp_event_source);
- safe_close(m->llmnr_ipv4_udp_fd);
- safe_close(m->llmnr_ipv6_udp_fd);
-
- sd_event_source_unref(m->llmnr_ipv4_tcp_event_source);
- sd_event_source_unref(m->llmnr_ipv6_tcp_event_source);
- safe_close(m->llmnr_ipv4_tcp_fd);
- safe_close(m->llmnr_ipv6_tcp_fd);
+ manager_llmnr_stop(m);
sd_event_source_unref(m->bus_retry_event_source);
sd_bus_unref(m->bus);
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;
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;
return -EAFNOSUPPORT;
}
-bool manager_known_dns_server(Manager *m, int family, const union in_addr_union *in_addr) {
+DnsServer* manager_find_dns_server(Manager *m, int family, const union in_addr_union *in_addr) {
DnsServer *s;
assert(m);
assert(in_addr);
LIST_FOREACH(servers, s, m->dns_servers)
- if (s->family == family && in_addr_equal(family, &s->address, in_addr))
- return true;
+ if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0)
+ return s;
LIST_FOREACH(servers, s, m->fallback_dns_servers)
- if (s->family == family && in_addr_equal(family, &s->address, in_addr))
- return true;
+ if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0)
+ return s;
- return false;
+ return NULL;
}
-static DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) {
+DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) {
assert(m);
if (m->current_dns_server == s)
in_addr_to_string(s->family, &s->address, &ip);
log_info("Switching to system DNS server %s.", strna(ip));
- } else
- log_info("No system DNS server set.");
+ }
m->current_dns_server = s;
+
+ if (m->unicast_scope)
+ dns_cache_flush(&m->unicast_scope->cache);
+
return s;
}
Link *l;
assert(m);
+ /* Try to read updates resolv.conf */
+ manager_read_resolv_conf(m);
+
if (!m->current_dns_server)
manager_set_dns_server(m, m->dns_servers);
~ianmdlvl / elogind.git / blobdiff