chiark / gitweb /
resolved: we don't need the DNS server "source" concept anymore, remove it
[elogind.git] / src / resolve / resolved-link.c
index 27477de7b5825b0da7dd4df581f0ddd4e4850e5e..6ac7c5be98e4ce92455c527119f50d5f4198d10c 100644 (file)
 #include <net/if.h>
 
 #include "sd-network.h"
-#include "dhcp-lease-internal.h"
 #include "strv.h"
 #include "resolved-link.h"
 
+#define DEFAULT_TTL (10)
+
+static void link_address_add_rrs(LinkAddress *a);
+
 int link_new(Manager *m, Link **ret, int ifindex) {
         _cleanup_(link_freep) Link *l = NULL;
         int r;
@@ -68,139 +71,122 @@ Link *link_free(Link *l) {
                 hashmap_remove(l->manager->links, INT_TO_PTR(l->ifindex));
 
         dns_scope_free(l->unicast_scope);
-        dns_scope_free(l->mdns_ipv4_scope);
-        dns_scope_free(l->mdns_ipv6_scope);
+        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;
- }
+}
 
-int link_update_rtnl(Link *l, sd_rtnl_message *m) {
+static void link_allocate_scopes(Link *l) {
         int r;
 
         assert(l);
-        assert(m);
 
-        r = sd_rtnl_message_link_get_flags(m, &l->flags);
-        if (r < 0)
-                return r;
+        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)
+                                log_warning("Failed to allocate DNS scope: %s", strerror(-r));
+                }
+        } else
+                l->unicast_scope = dns_scope_free(l->unicast_scope);
 
-        return 0;
-}
+        if (link_relevant(l, AF_INET) && l->manager->use_llmnr) {
+                if (!l->llmnr_ipv4_scope) {
+                        r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
+                        if (r < 0)
+                                log_warning("Failed to allocate LLMNR IPv4 scope: %s", strerror(-r));
+                }
+        } else
+                l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope);
 
-static int update_dhcp_dns_servers(Link *l) {
-        _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
-        _cleanup_free_ struct in_addr *nameservers = NULL;
-        DnsServer *s, *nx;
-        unsigned i;
-        size_t n;
-        int r;
+        if (link_relevant(l, AF_INET6) && l->manager->use_llmnr) {
+                if (!l->llmnr_ipv6_scope) {
+                        r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
+                        if (r < 0)
+                                log_warning("Failed to allocate LLMNR IPv6 scope: %s", strerror(-r));
+                }
+        } else
+                l->llmnr_ipv6_scope = dns_scope_free(l->llmnr_ipv6_scope);
+}
 
-        assert(l);
+static void link_add_rrs(Link *l) {
+        LinkAddress *a;
 
-        r = sd_network_dhcp_use_dns(l->ifindex);
-        if (r <= 0)
-                goto clear;
+        LIST_FOREACH(addresses, a, l->addresses)
+                link_address_add_rrs(a);
+}
 
-        r = sd_network_get_dhcp_lease(l->ifindex, &lease);
-        if (r < 0)
-                goto clear;
+int link_update_rtnl(Link *l, sd_rtnl_message *m) {
+        const char *n = NULL;
+        int r;
 
-        LIST_FOREACH(servers, s, l->dhcp_dns_servers)
-                s->marked = true;
+        assert(l);
+        assert(m);
 
-        r = sd_dhcp_lease_get_dns(lease, &nameservers, &n);
+        r = sd_rtnl_message_link_get_flags(m, &l->flags);
         if (r < 0)
-                goto clear;
+                return r;
 
-        for (i = 0; i < n; i++) {
-                union in_addr_union a = { .in = nameservers[i] };
+        sd_rtnl_message_read_u32(m, IFLA_MTU, &l->mtu);
 
-                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;
-                }
+        if (sd_rtnl_message_read_string(m, IFLA_IFNAME, &n) >= 0) {
+                strncpy(l->name, n, sizeof(l->name));
+                char_array_0(l->name);
         }
 
-        LIST_FOREACH_SAFE(servers, s, nx, l->dhcp_dns_servers)
-                if (s->marked)
-                        dns_server_free(s);
+        link_allocate_scopes(l);
+        link_add_rrs(l);
 
         return 0;
-
-clear:
-        while (l->dhcp_dns_servers)
-                dns_server_free(l->dhcp_dns_servers);
-
-        return r;
 }
 
-static int 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;
-        unsigned i;
-        size_t n;
         int r;
 
         assert(l);
 
-        LIST_FOREACH(servers, s, l->link_dns_servers)
+        LIST_FOREACH(servers, s, l->dns_servers)
                 s->marked = true;
 
-        r = sd_network_get_dns(l->ifindex, &nameservers, &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] };
+        STRV_FOREACH(nameserver, nameservers) {
+                union in_addr_union a;
+                int family;
 
-                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;
-                }
-        }
+                r = in_addr_from_string_auto(*nameserver, &family, &a);
+                if (r < 0)
+                        goto clear;
 
-        r = sd_network_get_dns6(l->ifindex, &nameservers6, &n);
-        if (r < 0)
-                goto clear;
-
-        for (i = 0; i < n; i++) {
-                union in_addr_union a = { .in6 = nameservers6[i] };
-
-                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;
 }
@@ -208,18 +194,15 @@ clear:
 int link_update_monitor(Link *l) {
         assert(l);
 
-        free(l->operational_state);
-        l->operational_state = NULL;
-
-        sd_network_get_link_operational_state(l->ifindex, &l->operational_state);
-
-        update_dhcp_dns_servers(l);
-        update_link_dns_servers(l);
+        link_update_dns_servers(l);
+        link_allocate_scopes(l);
+        link_add_rrs(l);
 
         return 0;
 }
 
-bool link_relevant(Link *l) {
+bool link_relevant(Link *l, int family) {
+        _cleanup_free_ char *state = NULL;
         LinkAddress *a;
 
         assert(l);
@@ -230,45 +213,37 @@ bool link_relevant(Link *l) {
         if (l->flags & IFF_LOOPBACK)
                 return false;
 
-        if (l->operational_state && !STR_IN_SET(l->operational_state, "unknown", "degraded", "routable"))
+        sd_network_get_link_operational_state(l->ifindex, &state);
+        if (state && !STR_IN_SET(state, "unknown", "degraded", "routable"))
                 return false;
 
         LIST_FOREACH(addresses, a, l->addresses)
-                if (link_address_relevant(a))
+                if (a->family == family && link_address_relevant(a))
                         return true;
 
         return false;
 }
 
-LinkAddress *link_find_address(Link *l, unsigned char family, union in_addr_union *in_addr) {
+LinkAddress *link_find_address(Link *l, int family, const union in_addr_union *in_addr) {
         LinkAddress *a;
 
         assert(l);
 
-        LIST_FOREACH(addresses, a, l->addresses) {
-
-                if (a->family == family &&
-                    in_addr_equal(family, &a->in_addr, in_addr))
+        LIST_FOREACH(addresses, a, l->addresses)
+                if (a->family == family && in_addr_equal(family, &a->in_addr, in_addr))
                         return a;
-        }
 
         return NULL;
 }
 
-DnsServer* link_find_dns_server(Link *l, DnsServerSource source, unsigned char family, union in_addr_union *in_addr) {
-        DnsServer *first, *s;
+DnsServer* link_find_dns_server(Link *l, int family, const 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) {
-
-                if (s->family == family &&
-                    in_addr_equal(family, &s->address, in_addr))
+        LIST_FOREACH(servers, s, l->dns_servers)
+                if (s->family == family && in_addr_equal(family, &s->address, in_addr))
                         return s;
-        }
-
         return NULL;
 }
 
@@ -276,9 +251,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;
 }
@@ -289,13 +262,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;
         }
@@ -308,15 +275,10 @@ 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, unsigned char family, union in_addr_union *in_addr) {
+int link_address_new(Link *l, LinkAddress **ret, int family, const union in_addr_union *in_addr) {
         LinkAddress *a;
 
         assert(l);
@@ -342,13 +304,130 @@ LinkAddress *link_address_free(LinkAddress *a) {
         if (!a)
                 return NULL;
 
-        if (a->link)
+        if (a->link) {
                 LIST_REMOVE(addresses, a->link->addresses, a);
 
+                if (a->llmnr_address_rr) {
+
+                        if (a->family == AF_INET && a->link->llmnr_ipv4_scope)
+                                dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_address_rr);
+                        else if (a->family == AF_INET6 && a->link->llmnr_ipv6_scope)
+                                dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_address_rr);
+
+                        dns_resource_record_unref(a->llmnr_address_rr);
+                }
+
+                if (a->llmnr_ptr_rr) {
+                        if (a->family == AF_INET && a->link->llmnr_ipv4_scope)
+                                dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_ptr_rr);
+                        else if (a->family == AF_INET6 && a->link->llmnr_ipv6_scope)
+                                dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_ptr_rr);
+
+                        dns_resource_record_unref(a->llmnr_ptr_rr);
+                }
+        }
+
         free(a);
         return NULL;
 }
 
+static void link_address_add_rrs(LinkAddress *a) {
+        int r;
+
+        assert(a);
+
+        if (a->family == AF_INET && a->link->llmnr_ipv4_scope) {
+
+                if (!a->link->manager->host_ipv4_key) {
+                        a->link->manager->host_ipv4_key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, a->link->manager->hostname);
+                        if (!a->link->manager->host_ipv4_key) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
+                }
+
+                if (!a->llmnr_address_rr) {
+                        a->llmnr_address_rr = dns_resource_record_new(a->link->manager->host_ipv4_key);
+                        if (!a->llmnr_address_rr) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
+
+                        a->llmnr_address_rr->a.in_addr = a->in_addr.in;
+                        a->llmnr_address_rr->ttl = DEFAULT_TTL;
+                }
+
+                if (!a->llmnr_ptr_rr) {
+                        r = dns_resource_record_new_reverse(&a->llmnr_ptr_rr, a->family, &a->in_addr, a->link->manager->hostname);
+                        if (r < 0)
+                                goto fail;
+
+                        a->llmnr_ptr_rr->ttl = DEFAULT_TTL;
+                }
+
+                if (link_address_relevant(a)) {
+                        r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->llmnr_address_rr);
+                        if (r < 0)
+                                goto fail;
+
+                        r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->llmnr_ptr_rr);
+                        if (r < 0)
+                                goto fail;
+                } else {
+                        dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_address_rr);
+                        dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_ptr_rr);
+                }
+        }
+
+        if (a->family == AF_INET6 && a->link->llmnr_ipv6_scope) {
+
+                if (!a->link->manager->host_ipv6_key) {
+                        a->link->manager->host_ipv6_key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_AAAA, a->link->manager->hostname);
+                        if (!a->link->manager->host_ipv6_key) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
+                }
+
+                if (!a->llmnr_address_rr) {
+                        a->llmnr_address_rr = dns_resource_record_new(a->link->manager->host_ipv6_key);
+                        if (!a->llmnr_address_rr) {
+                                r = -ENOMEM;
+                                goto fail;
+                        }
+
+                        a->llmnr_address_rr->aaaa.in6_addr = a->in_addr.in6;
+                        a->llmnr_address_rr->ttl = DEFAULT_TTL;
+                }
+
+                if (!a->llmnr_ptr_rr) {
+                        r = dns_resource_record_new_reverse(&a->llmnr_ptr_rr, a->family, &a->in_addr, a->link->manager->hostname);
+                        if (r < 0)
+                                goto fail;
+
+                        a->llmnr_ptr_rr->ttl = DEFAULT_TTL;
+                }
+
+                if (link_address_relevant(a)) {
+                        r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->llmnr_address_rr);
+                        if (r < 0)
+                                goto fail;
+
+                        r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->llmnr_ptr_rr);
+                        if (r < 0)
+                                goto fail;
+                } else {
+                        dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_address_rr);
+                        dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_ptr_rr);
+                }
+        }
+
+        return;
+
+fail:
+        log_debug("Failed to update address RRs: %s", strerror(-r));
+}
+
 int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) {
         int r;
         assert(a);
@@ -358,9 +437,10 @@ int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) {
         if (r < 0)
                 return r;
 
-        r = sd_rtnl_message_addr_get_scope(m, &a->scope);
-        if (r < 0)
-                return r;
+        sd_rtnl_message_addr_get_scope(m, &a->scope);
+
+        link_allocate_scopes(a->link);
+        link_add_rrs(a->link);
 
         return 0;
 }