X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-link.c;h=93ccc04491cf6a0a98de39db18d965264f26ab3a;hp=804837c6e87b80a9e5b430723764ba8555102429;hb=4e945a6f7971fd7d1f6b2c62ee3afdaff3c95ce4;hpb=1716f6dcf54d4c181c2e2558e3d5414f54c8d9ca

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index 804837c6e..93ccc0449 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -22,8 +22,8 @@
 #include <net/if.h>
 
 #include "sd-network.h"
-#include "dhcp-lease-internal.h"
 #include "strv.h"
+#include "missing.h"
 #include "resolved-link.h"
 
 int link_new(Manager *m, Link **ret, int ifindex) {
@@ -71,11 +71,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 +83,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)
@@ -95,7 +92,7 @@ static void link_allocate_scopes(Link *l) {
         } else
                 l->unicast_scope = dns_scope_free(l->unicast_scope);
 
-        if (link_relevant(l, AF_INET) && l->manager->use_llmnr) {
+        if (link_relevant(l, AF_INET) && l->manager->llmnr_support != SUPPORT_NO) {
                 if (!l->llmnr_ipv4_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
                         if (r < 0)
@@ -104,7 +101,7 @@ static void link_allocate_scopes(Link *l) {
         } else
                 l->llmnr_ipv4_scope = dns_scope_free(l->llmnr_ipv4_scope);
 
-        if (link_relevant(l, AF_INET6) && l->manager->use_llmnr) {
+        if (link_relevant(l, AF_INET6) && l->manager->llmnr_support != SUPPORT_NO) {
                 if (!l->llmnr_ipv6_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
                         if (r < 0)
@@ -114,6 +111,13 @@ static void link_allocate_scopes(Link *l) {
                 l->llmnr_ipv6_scope = dns_scope_free(l->llmnr_ipv6_scope);
 }
 
+void link_add_rrs(Link *l, bool force_remove) {
+        LinkAddress *a;
+
+        LIST_FOREACH(addresses, a, l->addresses)
+                link_address_add_rrs(a, force_remove);
+}
+
 int link_update_rtnl(Link *l, sd_rtnl_message *m) {
         const char *n = NULL;
         int r;
@@ -133,118 +137,53 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) {
         }
 
         link_allocate_scopes(l);
-        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);
+        link_add_rrs(l, false);
 
         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] };
+        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;
 
-        n = sd_network_get_dns6(l->ifindex, &nameservers6);
-        if (n < 0) {
-                r = n;
-                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, DNS_SERVER_LINK, 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,23 +191,27 @@ 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);
+        link_add_rrs(l, false);
 
         return 0;
 }
 
-bool link_relevant(Link *l, unsigned char family) {
+bool link_relevant(Link *l, int family) {
         _cleanup_free_ char *state = NULL;
         LinkAddress *a;
 
         assert(l);
 
-        /* A link is relevant if it isn't a loopback device and has at
-         * least one relevant IP address */
+        /* A link is relevant if it isn't a loopback or pointopoint
+         * device, has a link beat, can do multicast and has at least
+         * one relevant IP address */
 
-        if (l->flags & IFF_LOOPBACK)
+        if (l->flags & (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_DORMANT))
+                return false;
+
+        if ((l->flags & (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST)) != (IFF_UP|IFF_LOWER_UP|IFF_MULTICAST))
                 return false;
 
         sd_network_get_link_operational_state(l->ifindex, &state);
@@ -282,7 +225,7 @@ bool link_relevant(Link *l, unsigned char family) {
         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);
@@ -294,27 +237,40 @@ LinkAddress *link_find_address(Link *l, unsigned char family, union in_addr_unio
         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)
+        LIST_FOREACH(servers, s, l->dns_servers)
                 if (s->family == family && in_addr_equal(family, &s->address, in_addr))
                         return s;
-
         return NULL;
 }
 
+static DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
+        assert(l);
+
+        if (l->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 DNS server %s for interface %s.", strna(ip), l->name);
+        } else
+                log_info("No DNS server set for interface %s.", l->name);
+
+        l->current_dns_server = s;
+        return s;
+}
+
 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;
+                link_set_dns_server(l, l->dns_servers);
 
         return l->current_dns_server;
 }
@@ -322,37 +278,18 @@ DnsServer *link_get_dns_server(Link *l) {
 void link_next_dns_server(Link *l) {
         assert(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;
-                if (l->current_dns_server)
-                        return;
-        }
-
         if (!l->current_dns_server)
                 return;
 
         if (l->current_dns_server->servers_next) {
-                l->current_dns_server = l->current_dns_server->servers_next;
+                link_set_dns_server(l, l->current_dns_server->servers_next);
                 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;
-        }
+        link_set_dns_server(l, 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);
@@ -378,13 +315,154 @@ 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);
+                }
+
+                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_address_rr);
+        dns_resource_record_unref(a->llmnr_ptr_rr);
+
         free(a);
         return NULL;
 }
 
+void link_address_add_rrs(LinkAddress *a, bool force_remove) {
+        int r;
+
+        assert(a);
+
+        if (a->family == AF_INET) {
+
+                if (!force_remove &&
+                    link_address_relevant(a) &&
+                    a->link->llmnr_ipv4_scope &&
+                    a->link->manager->llmnr_support == SUPPORT_YES) {
+
+                        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 = LLMNR_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 = LLMNR_DEFAULT_TTL;
+                        }
+
+                        r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_address_rr, true);
+                        if (r < 0)
+                                log_warning("Failed tp add A record to LLMNR zone: %s", strerror(-r));
+
+                        r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_ptr_rr, false);
+                        if (r < 0)
+                                log_warning("Failed tp add IPv6 PTR record to LLMNR zone: %s", strerror(-r));
+                } else {
+                        if (a->llmnr_address_rr) {
+                                if (a->link->llmnr_ipv4_scope)
+                                        dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_address_rr);
+                                a->llmnr_address_rr = dns_resource_record_unref(a->llmnr_address_rr);
+                        }
+
+                        if (a->llmnr_ptr_rr) {
+                                if (a->link->llmnr_ipv4_scope)
+                                        dns_zone_remove_rr(&a->link->llmnr_ipv4_scope->zone, a->llmnr_ptr_rr);
+                                a->llmnr_ptr_rr = dns_resource_record_unref(a->llmnr_ptr_rr);
+                        }
+                }
+        }
+
+        if (a->family == AF_INET6) {
+
+                if (!force_remove &&
+                    link_address_relevant(a) &&
+                    a->link->llmnr_ipv6_scope &&
+                    a->link->manager->llmnr_support == SUPPORT_YES) {
+
+                        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 = LLMNR_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 = LLMNR_DEFAULT_TTL;
+                        }
+
+                        r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_address_rr, true);
+                        if (r < 0)
+                                log_warning("Failed to add AAAA record to LLMNR zone: %s", strerror(-r));
+
+                        r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_ptr_rr, false);
+                        if (r < 0)
+                                log_warning("Failed to add IPv6 PTR record to LLMNR zone: %s", strerror(-r));
+                } else {
+                        if (a->llmnr_address_rr) {
+                                if (a->link->llmnr_ipv6_scope)
+                                        dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_address_rr);
+                                a->llmnr_address_rr = dns_resource_record_unref(a->llmnr_address_rr);
+                        }
+
+                        if (a->llmnr_ptr_rr) {
+                                if (a->link->llmnr_ipv6_scope)
+                                        dns_zone_remove_rr(&a->link->llmnr_ipv6_scope->zone, a->llmnr_ptr_rr);
+                                a->llmnr_ptr_rr = dns_resource_record_unref(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);
@@ -397,6 +475,8 @@ int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) {
         sd_rtnl_message_addr_get_scope(m, &a->scope);
 
         link_allocate_scopes(a->link);
+        link_add_rrs(a->link, false);
+
         return 0;
 }