X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-link.c;h=7dcaf18630da5cc325e1240fcd88958bc18a6e26;hb=90ab504273a7f186ebb76e6acfb778b4e0d7c91b;hp=7418ea1ed99111951713b39b1672e2090c260c02;hpb=5cb36f41f01cf4b1f4395abfffd1b33116591e58;p=elogind.git

diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c
index 7418ea1ed..7dcaf1863 100644
--- a/src/resolve/resolved-link.c
+++ b/src/resolve/resolved-link.c
@@ -42,6 +42,7 @@ int link_new(Manager *m, Link **ret, int ifindex) {
                 return -ENOMEM;
 
         l->ifindex = ifindex;
+        l->llmnr_support = SUPPORT_YES;
 
         r = hashmap_put(m->links, INT_TO_PTR(ifindex), l);
         if (r < 0)
@@ -92,7 +93,10 @@ 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->llmnr_support != SUPPORT_NO) {
+        if (link_relevant(l, AF_INET) &&
+            l->llmnr_support != SUPPORT_NO &&
+            l->manager->llmnr_support != SUPPORT_NO &&
+            l->manager->llmnr_ipv4_udp_fd >= 0) {
                 if (!l->llmnr_ipv4_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv4_scope, l, DNS_PROTOCOL_LLMNR, AF_INET);
                         if (r < 0)
@@ -101,7 +105,10 @@ 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->llmnr_support != SUPPORT_NO) {
+        if (link_relevant(l, AF_INET6) &&
+            l->llmnr_support != SUPPORT_NO &&
+            l->manager->llmnr_support != SUPPORT_NO &&
+            l->manager->llmnr_ipv6_udp_fd >= 0) {
                 if (!l->llmnr_ipv6_scope) {
                         r = dns_scope_new(l->manager, &l->llmnr_ipv6_scope, l, DNS_PROTOCOL_LLMNR, AF_INET6);
                         if (r < 0)
@@ -132,7 +139,7 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) {
         sd_rtnl_message_read_u32(m, IFLA_MTU, &l->mtu);
 
         if (sd_rtnl_message_read_string(m, IFLA_IFNAME, &n) >= 0) {
-                strncpy(l->name, n, sizeof(l->name));
+                strncpy(l->name, n, sizeof(l->name)-1);
                 char_array_0(l->name);
         }
 
@@ -150,7 +157,7 @@ static int link_update_dns_servers(Link *l) {
 
         assert(l);
 
-        r = sd_network_get_dns(l->ifindex, &nameservers);
+        r = sd_network_get_link_dns(l->ifindex, &nameservers);
         if (r < 0)
                 goto clear;
 
@@ -188,10 +195,40 @@ clear:
         return r;
 }
 
+static int link_update_llmnr_support(Link *l) {
+        _cleanup_free_ char *b = NULL;
+        int r;
+
+        assert(l);
+
+        r = sd_network_get_link_llmnr(l->ifindex, &b);
+        if (r < 0)
+                goto clear;
+
+        r = parse_boolean(b);
+        if (r < 0) {
+                if (streq(b, "resolve"))
+                        l->llmnr_support = SUPPORT_RESOLVE;
+                else
+                        goto clear;
+
+        } else if (r > 0)
+                l->llmnr_support = SUPPORT_YES;
+        else
+                l->llmnr_support = SUPPORT_NO;
+
+        return 0;
+
+clear:
+        l->llmnr_support = SUPPORT_YES;
+        return r;
+}
+
 int link_update_monitor(Link *l) {
         assert(l);
 
         link_update_dns_servers(l);
+        link_update_llmnr_support(l);
         link_allocate_scopes(l);
         link_add_rrs(l, false);
 
@@ -248,7 +285,7 @@ DnsServer* link_find_dns_server(Link *l, int family, const union in_addr_union *
         return NULL;
 }
 
-static DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
+DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
         assert(l);
 
         if (l->current_dns_server == s)
@@ -259,10 +296,13 @@ static DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
 
                 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;
+
+        if (l->unicast_scope)
+                dns_cache_flush(&l->unicast_scope->cache);
+
         return s;
 }
 
@@ -350,6 +390,7 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) {
                 if (!force_remove &&
                     link_address_relevant(a) &&
                     a->link->llmnr_ipv4_scope &&
+                    a->link->llmnr_support == SUPPORT_YES &&
                     a->link->manager->llmnr_support == SUPPORT_YES) {
 
                         if (!a->link->manager->host_ipv4_key) {
@@ -381,11 +422,11 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) {
 
                         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));
+                                log_warning("Failed to 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));
+                                log_warning("Failed to add IPv6 PTR record to LLMNR zone: %s", strerror(-r));
                 } else {
                         if (a->llmnr_address_rr) {
                                 if (a->link->llmnr_ipv4_scope)
@@ -406,6 +447,7 @@ void link_address_add_rrs(LinkAddress *a, bool force_remove) {
                 if (!force_remove &&
                     link_address_relevant(a) &&
                     a->link->llmnr_ipv6_scope &&
+                    a->link->llmnr_support == SUPPORT_YES &&
                     a->link->manager->llmnr_support == SUPPORT_YES) {
 
                         if (!a->link->manager->host_ipv6_key) {
@@ -483,7 +525,7 @@ int link_address_update_rtnl(LinkAddress *a, sd_rtnl_message *m) {
 bool link_address_relevant(LinkAddress *a) {
         assert(a);
 
-        if (a->flags & IFA_F_DEPRECATED)
+        if (a->flags & (IFA_F_DEPRECATED|IFA_F_TENTATIVE))
                 return false;
 
         if (IN_SET(a->scope, RT_SCOPE_HOST, RT_SCOPE_NOWHERE))