X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fresolve%2Fresolved-dns-scope.c;h=190c5f41af1d20c8ffdc71d69236ccb1d704952b;hb=901fd8164797f3eeb9921c85915dc409d49ab5d8;hp=7b5580ffcc2f92d8cd94c9a3805030808a1b6c9e;hpb=faec72d5dedae93f43c2dd624de1392ed9bacd80;p=elogind.git diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index 7b5580ffc..190c5f41a 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -23,12 +23,13 @@ #include "strv.h" #include "socket-util.h" +#include "af-list.h" #include "resolved-dns-domain.h" #include "resolved-dns-scope.h" #define SEND_TIMEOUT_USEC (2*USEC_PER_SEC) -int dns_scope_new(Manager *m, DnsScope **ret, DnsScopeType t) { +int dns_scope_new(Manager *m, DnsScope **ret, Link *l, DnsProtocol protocol, int family) { DnsScope *s; assert(m); @@ -39,10 +40,16 @@ int dns_scope_new(Manager *m, DnsScope **ret, DnsScopeType t) { return -ENOMEM; s->manager = m; - s->type = t; + s->link = l; + s->protocol = protocol; + s->family = family; LIST_PREPEND(scopes, m->dns_scopes, s); + dns_scope_llmnr_membership(s, true); + + log_debug("New scope on link %s, protocol %s, family %s", l ? l->name : "*", dns_protocol_to_string(protocol), family == AF_UNSPEC ? "*" : af_to_name(family)); + *ret = s; return 0; } @@ -51,6 +58,10 @@ DnsScope* dns_scope_free(DnsScope *s) { if (!s) return NULL; + log_debug("Removing scope on link %s, protocol %s, family %s", s->link ? s->link->name : "*", dns_protocol_to_string(s->protocol), s->family == AF_UNSPEC ? "*" : af_to_name(s->family)); + + dns_scope_llmnr_membership(s, false); + while (s->transactions) { DnsQuery *q; @@ -60,6 +71,8 @@ DnsScope* dns_scope_free(DnsScope *s) { dns_query_finish(q); } + dns_cache_flush(&s->cache); + LIST_REMOVE(scopes, s->manager->dns_scopes, s); strv_free(s->domains); free(s); @@ -70,6 +83,9 @@ DnsScope* dns_scope_free(DnsScope *s) { DnsServer *dns_scope_get_server(DnsScope *s) { assert(s); + if (s->protocol != DNS_PROTOCOL_DNS) + return NULL; + if (s->link) return link_get_dns_server(s->link); else @@ -79,6 +95,9 @@ DnsServer *dns_scope_get_server(DnsScope *s) { void dns_scope_next_dns_server(DnsScope *s) { assert(s); + if (s->protocol != DNS_PROTOCOL_DNS) + return; + if (s->link) link_next_dns_server(s->link); else @@ -86,42 +105,73 @@ void dns_scope_next_dns_server(DnsScope *s) { } int dns_scope_send(DnsScope *s, DnsPacket *p) { - int ifindex = 0; - DnsServer *srv; - int r; + union in_addr_union addr; + int ifindex = 0, r; + int family; + uint16_t port; + uint32_t mtu; + int fd; assert(s); assert(p); - - srv = dns_scope_get_server(s); - if (!srv) - return -ESRCH; + assert(p->protocol == s->protocol); if (s->link) { - if (p->size > s->link->mtu) - return -EMSGSIZE; - + mtu = s->link->mtu; ifindex = s->link->ifindex; - } else { - uint32_t mtu; - + } else mtu = manager_find_mtu(s->manager); - if (mtu > 0) { - if (p->size > mtu) - return -EMSGSIZE; - } - } - if (p->size > DNS_PACKET_UNICAST_SIZE_MAX) - return -EMSGSIZE; + if (s->protocol == DNS_PROTOCOL_DNS) { + DnsServer *srv; - if (srv->family == AF_INET) - r = manager_dns_ipv4_send(s->manager, srv, ifindex, p); - else if (srv->family == AF_INET6) - r = manager_dns_ipv6_send(s->manager, srv, ifindex, p); - else + srv = dns_scope_get_server(s); + if (!srv) + return -ESRCH; + + family = srv->family; + addr = srv->address; + port = 53; + + if (p->size > DNS_PACKET_UNICAST_SIZE_MAX) + return -EMSGSIZE; + + if (p->size > mtu) + return -EMSGSIZE; + + if (family == AF_INET) + fd = manager_dns_ipv4_fd(s->manager); + else if (family == AF_INET6) + fd = manager_dns_ipv6_fd(s->manager); + else + return -EAFNOSUPPORT; + if (fd < 0) + return fd; + + } else if (s->protocol == DNS_PROTOCOL_LLMNR) { + + if (DNS_PACKET_QDCOUNT(p) > 1) + return -ENOTSUP; + + family = s->family; + port = 5355; + + if (family == AF_INET) { + addr.in = LLMNR_MULTICAST_IPV4_ADDRESS; + /* fd = manager_dns_ipv4_fd(s->manager); */ + fd = manager_llmnr_ipv4_udp_fd(s->manager); + } else if (family == AF_INET6) { + addr.in6 = LLMNR_MULTICAST_IPV6_ADDRESS; + fd = manager_llmnr_ipv6_udp_fd(s->manager); + /* fd = manager_dns_ipv6_fd(s->manager); */ + } else + return -EAFNOSUPPORT; + if (fd < 0) + return fd; + } else return -EAFNOSUPPORT; + r = manager_send(s->manager, fd, ifindex, family, &addr, port, p); if (r < 0) return r; @@ -132,7 +182,7 @@ int dns_scope_tcp_socket(DnsScope *s) { _cleanup_close_ int fd = -1; union sockaddr_union sa = {}; socklen_t salen; - int one, ifindex, ret; + int one, ret; DnsServer *srv; int r; @@ -142,9 +192,6 @@ int dns_scope_tcp_socket(DnsScope *s) { if (!srv) return -ESRCH; - if (s->link) - ifindex = s->link->ifindex; - sa.sa.sa_family = srv->family; if (srv->family == AF_INET) { sa.in.sin_port = htobe16(53); @@ -153,7 +200,7 @@ int dns_scope_tcp_socket(DnsScope *s) { } else if (srv->family == AF_INET6) { sa.in6.sin6_port = htobe16(53); sa.in6.sin6_addr = srv->address.in6; - sa.in6.sin6_scope_id = ifindex; + sa.in6.sin6_scope_id = s->link ? s->link->ifindex : 0; salen = sizeof(sa.in6); } else return -EAFNOSUPPORT; @@ -174,7 +221,7 @@ int dns_scope_tcp_socket(DnsScope *s) { return ret; } -DnsScopeMatch dns_scope_test(DnsScope *s, const char *domain) { +DnsScopeMatch dns_scope_good_domain(DnsScope *s, const char *domain) { char **i; assert(s); @@ -190,25 +237,85 @@ DnsScopeMatch dns_scope_test(DnsScope *s, const char *domain) { if (is_localhost(domain)) return DNS_SCOPE_NO; - if (s->type == DNS_SCOPE_MDNS) { + if (s->protocol == DNS_PROTOCOL_DNS) { if (dns_name_endswith(domain, "254.169.in-addr.arpa") || - dns_name_endswith(domain, "0.8.e.f.ip6.arpa")) - return DNS_SCOPE_YES; - else if (dns_name_endswith(domain, "local") || - !dns_name_single_label(domain)) + dns_name_endswith(domain, "0.8.e.f.ip6.arpa") || + dns_name_single_label(domain)) + return DNS_SCOPE_NO; + + return DNS_SCOPE_MAYBE; + } + + if (s->protocol == DNS_PROTOCOL_MDNS) { + if (dns_name_endswith(domain, "254.169.in-addr.arpa") || + dns_name_endswith(domain, "0.8.e.f.ip6.arpa") || + dns_name_endswith(domain, "local")) return DNS_SCOPE_MAYBE; return DNS_SCOPE_NO; } - if (s->type == DNS_SCOPE_DNS) { + if (s->protocol == DNS_PROTOCOL_LLMNR) { if (dns_name_endswith(domain, "254.169.in-addr.arpa") || dns_name_endswith(domain, "0.8.e.f.ip6.arpa") || dns_name_single_label(domain)) - return DNS_SCOPE_NO; + return DNS_SCOPE_MAYBE; - return DNS_SCOPE_MAYBE; + return DNS_SCOPE_NO; } - assert_not_reached("Unknown scope type"); + assert_not_reached("Unknown scope protocol"); +} + +int dns_scope_good_key(DnsScope *s, DnsResourceKey *key) { + assert(s); + assert(key); + + if (s->protocol == DNS_PROTOCOL_DNS) + return true; + + /* On mDNS and LLMNR, send A and AAAA queries only on the + * respective scopes */ + + if (s->family == AF_INET && key->class == DNS_CLASS_IN && key->type == DNS_TYPE_AAAA) + return false; + + if (s->family == AF_INET6 && key->class == DNS_CLASS_IN && key->type == DNS_TYPE_A) + return false; + + return true; +} + +int dns_scope_llmnr_membership(DnsScope *s, bool b) { + int fd; + + if (s->family == AF_INET) { + struct ip_mreqn mreqn = { + .imr_multiaddr = LLMNR_MULTICAST_IPV4_ADDRESS, + .imr_ifindex = s->link->ifindex, + }; + + fd = manager_llmnr_ipv4_udp_fd(s->manager); + if (fd < 0) + return fd; + + if (setsockopt(fd, IPPROTO_IP, b ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP, &mreqn, sizeof(mreqn)) < 0) + return -errno; + + } else if (s->family == AF_INET6) { + struct ipv6_mreq mreq = { + .ipv6mr_multiaddr = LLMNR_MULTICAST_IPV6_ADDRESS, + .ipv6mr_interface = s->link->ifindex, + }; + + fd = manager_llmnr_ipv6_udp_fd(s->manager); + if (fd < 0) + return fd; + + if (setsockopt(fd, IPPROTO_IPV6, b ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP, &mreq, sizeof(mreq)) < 0) + return -errno; + } else + return -EAFNOSUPPORT; + + return 0; }