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=7418ea1ed99111951713b39b1672e2090c260c02;hp=341cb5aea299d85fcc9b8d5974ec9f4d35a38a10;hb=5cb36f41f01cf4b1f4395abfffd1b33116591e58;hpb=0c903ae7db52af8ecad0619ec0da021f951c9c1c diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 341cb5aea..7418ea1ed 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -23,13 +23,9 @@ #include "sd-network.h" #include "strv.h" +#include "missing.h" #include "resolved-link.h" -/* RFC 4795 Section 2.8. suggests a TTL of 30s by default */ -#define LLMNR_DEFAULT_TTL (30) - -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; @@ -96,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) @@ -105,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) @@ -115,11 +111,11 @@ static void link_allocate_scopes(Link *l) { l->llmnr_ipv6_scope = dns_scope_free(l->llmnr_ipv6_scope); } -static void link_add_rrs(Link *l) { +void link_add_rrs(Link *l, bool force_remove) { LinkAddress *a; LIST_FOREACH(addresses, a, l->addresses) - link_address_add_rrs(a); + link_address_add_rrs(a, force_remove); } int link_update_rtnl(Link *l, sd_rtnl_message *m) { @@ -141,7 +137,7 @@ int link_update_rtnl(Link *l, sd_rtnl_message *m) { } link_allocate_scopes(l); - link_add_rrs(l); + link_add_rrs(l, false); return 0; } @@ -154,13 +150,13 @@ static int link_update_dns_servers(Link *l) { assert(l); - LIST_FOREACH(servers, s, l->dns_servers) - s->marked = true; - r = sd_network_get_dns(l->ifindex, &nameservers); if (r < 0) goto clear; + LIST_FOREACH(servers, s, l->dns_servers) + s->marked = true; + STRV_FOREACH(nameserver, nameservers) { union in_addr_union a; int family; @@ -173,7 +169,7 @@ static int link_update_dns_servers(Link *l) { if (s) s->marked = false; else { - r = dns_server_new(l->manager, NULL, l, family, &a); + r = dns_server_new(l->manager, NULL, DNS_SERVER_LINK, l, family, &a); if (r < 0) goto clear; } @@ -197,7 +193,7 @@ int link_update_monitor(Link *l) { link_update_dns_servers(l); link_allocate_scopes(l); - link_add_rrs(l); + link_add_rrs(l, false); return 0; } @@ -208,10 +204,14 @@ bool link_relevant(Link *l, int family) { 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|IFF_POINTOPOINT|IFF_DORMANT)) + return false; - if (l->flags & IFF_LOOPBACK) + 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); @@ -248,11 +248,29 @@ 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) { + 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->dns_servers; + link_set_dns_server(l, l->dns_servers); return l->current_dns_server; } @@ -260,23 +278,15 @@ 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->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; } - l->current_dns_server = l->dns_servers; + link_set_dns_server(l, l->dns_servers); } int link_address_new(Link *l, LinkAddress **ret, int family, const union in_addr_union *in_addr) { @@ -309,13 +319,10 @@ LinkAddress *link_address_free(LinkAddress *a) { 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) { @@ -323,103 +330,130 @@ LinkAddress *link_address_free(LinkAddress *a) { 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); } } + dns_resource_record_unref(a->llmnr_address_rr); + dns_resource_record_unref(a->llmnr_ptr_rr); + free(a); return NULL; } -static void link_address_add_rrs(LinkAddress *a) { +void link_address_add_rrs(LinkAddress *a, bool force_remove) { int r; assert(a); - if (a->family == AF_INET && a->link->llmnr_ipv4_scope) { + 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; + 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 = 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; } - 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; - 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; - } + a->llmnr_ptr_rr->ttl = LLMNR_DEFAULT_TTL; + } - if (link_address_relevant(a)) { - r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->llmnr_address_rr); + r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_address_rr, true); if (r < 0) - goto fail; + log_warning("Failed tp add A record to LLMNR zone: %s", strerror(-r)); - r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->llmnr_ptr_rr); + r = dns_zone_put(&a->link->llmnr_ipv4_scope->zone, a->link->llmnr_ipv4_scope, a->llmnr_ptr_rr, false); if (r < 0) - goto fail; + log_warning("Failed tp add IPv6 PTR record to LLMNR zone: %s", strerror(-r)); } 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->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 && a->link->llmnr_ipv6_scope) { + 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; + 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 = 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; } - 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; + 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; - } + a->llmnr_ptr_rr->ttl = LLMNR_DEFAULT_TTL; + } - if (link_address_relevant(a)) { - r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->llmnr_address_rr); + r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_address_rr, true); if (r < 0) - goto fail; + log_warning("Failed to add AAAA record to LLMNR zone: %s", strerror(-r)); - r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->llmnr_ptr_rr); + r = dns_zone_put(&a->link->llmnr_ipv6_scope->zone, a->link->llmnr_ipv6_scope, a->llmnr_ptr_rr, false); if (r < 0) - goto fail; + log_warning("Failed to add IPv6 PTR record to LLMNR zone: %s", strerror(-r)); } 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); + 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); + } } } @@ -441,7 +475,7 @@ 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); + link_add_rrs(a->link, false); return 0; }