X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fresolve%2Fresolved-manager.c;h=f4fa197d49ff83e87beb575488a10c2c41c445c2;hb=359017c1aec9596e9d3c4c19bd62d34a6f3366b8;hp=fed9a7797359020bb2c30d62289a7a494f257637;hpb=e1c959948c0e31d6997bcdfbabfbd077784b2bae;p=elogind.git diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index fed9a7797..f4fa197d4 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -29,8 +29,6 @@ #include "rtnl-util.h" #include "event-util.h" #include "network-util.h" -#include "sd-dhcp-lease.h" -#include "dhcp-lease-internal.h" #include "network-internal.h" #include "conf-parser.h" #include "socket-util.h" @@ -94,9 +92,8 @@ fail: static int manager_process_address(sd_rtnl *rtnl, sd_rtnl_message *mm, void *userdata) { Manager *m = userdata; union in_addr_union address; - unsigned char family; uint16_t type; - int r, ifindex; + int r, ifindex, family; LinkAddress *a; Link *l; @@ -311,7 +308,7 @@ static int parse_dns_server_string(Manager *m, const char *string) { FOREACH_WORD_QUOTED(word, length, string, state) { char buffer[length+1]; - unsigned family; + int family; union in_addr_union addr; memcpy(buffer, word, length); @@ -327,7 +324,7 @@ static int parse_dns_server_string(Manager *m, const char *string) { if (manager_find_dns_server(m, family, &addr)) continue; - r = dns_server_new(m, NULL, DNS_SERVER_SYSTEM, NULL, family, &addr); + r = dns_server_new(m, NULL, NULL, family, &addr); if (r < 0) return r; } @@ -392,8 +389,11 @@ int manager_new(Manager **ret) { return -ENOMEM; m->dns_ipv4_fd = m->dns_ipv6_fd = -1; + m->llmnr_ipv4_udp_fd = m->llmnr_ipv6_udp_fd = -1; - r = parse_dns_server_string(m, /* "172.31.0.125 2001:4860:4860::8888 2001:4860:4860::8889" */ DNS_SERVERS); + m->use_llmnr = true; + + r = parse_dns_server_string(m, DNS_SERVERS); if (r < 0) return r; @@ -406,7 +406,7 @@ int manager_new(Manager **ret) { sd_event_set_watchdog(m->event, true); - r = dns_scope_new(m, &m->unicast_scope, DNS_SCOPE_DNS); + r = dns_scope_new(m, &m->unicast_scope, NULL, DNS_PROTOCOL_DNS, AF_UNSPEC); if (r < 0) return r; @@ -453,10 +453,14 @@ Manager *manager_free(Manager *m) { sd_event_source_unref(m->dns_ipv4_event_source); sd_event_source_unref(m->dns_ipv6_event_source); - safe_close(m->dns_ipv4_fd); safe_close(m->dns_ipv6_fd); + sd_event_source_unref(m->llmnr_ipv4_udp_event_source); + sd_event_source_unref(m->llmnr_ipv6_udp_event_source); + safe_close(m->llmnr_ipv4_udp_fd); + safe_close(m->llmnr_ipv6_udp_fd); + sd_event_source_unref(m->bus_retry_event_source); sd_bus_unref(m->bus); @@ -475,7 +479,7 @@ static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { assert(count); r = in_addr_to_string(s->family, &s->address, &t); - if (r < 0) { + if (r < 0) { log_warning("Invalid DNS address. Ignoring."); return; } @@ -511,13 +515,9 @@ int manager_write_resolv_conf(Manager *m) { "# resolv.conf(5) in a different way, replace the symlink by a\n" "# static file or a different symlink.\n\n", f); - HASHMAP_FOREACH(l, m->links, i) { - LIST_FOREACH(servers, s, l->link_dns_servers) - write_resolve_conf_server(s, f, &count); - - LIST_FOREACH(servers, s, l->dhcp_dns_servers) + HASHMAP_FOREACH(l, m->links, i) + LIST_FOREACH(servers, s, l->dns_servers) write_resolve_conf_server(s, f, &count); - } LIST_FOREACH(servers, s, m->dns_servers) write_resolve_conf_server(s, f, &count); @@ -539,35 +539,44 @@ fail: return r; } -int manager_dns_ipv4_recv(Manager *m, DnsPacket **ret) { +int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; + union { + struct cmsghdr header; /* For alignment */ + uint8_t buffer[CMSG_SPACE(MAX(sizeof(struct in_pktinfo), sizeof(struct in6_pktinfo))) + + CMSG_SPACE(int) /* ttl/hoplimit */ + + 1024 /* kernel appears to require extra buffer space */]; + } control; + union sockaddr_union sa; struct msghdr mh = {}; - int fd, ms = 0, r; + struct cmsghdr *cmsg; struct iovec iov; + int ms = 0, r; ssize_t l; assert(m); + assert(fd >= 0); assert(ret); - fd = manager_dns_ipv4_fd(m); - if (fd < 0) - return fd; - r = ioctl(fd, FIONREAD, &ms); if (r < 0) return -errno; if (ms < 0) return -EIO; - r = dns_packet_new(&p, ms); + r = dns_packet_new(&p, protocol, ms); if (r < 0) return r; iov.iov_base = DNS_PACKET_DATA(p); iov.iov_len = p->allocated; + mh.msg_name = &sa.sa; + mh.msg_namelen = sizeof(sa); mh.msg_iov = &iov; mh.msg_iovlen = 1; + mh.msg_control = &control; + mh.msg_controllen = sizeof(control); l = recvmsg(fd, &mh, 0); if (l < 0) { @@ -580,56 +589,58 @@ int manager_dns_ipv4_recv(Manager *m, DnsPacket **ret) { if (l <= 0) return -EIO; - p->size = (size_t) l; + assert(!(mh.msg_flags & MSG_CTRUNC)); + assert(!(mh.msg_flags & MSG_TRUNC)); - *ret = p; - p = NULL; + p->size = (size_t) l; - return 1; -} + p->family = sa.sa.sa_family; + if (p->family == AF_INET) + p->sender.in = sa.in.sin_addr; + else if (p->family == AF_INET6) + p->sender.in6 = sa.in6.sin6_addr; + else + return -EAFNOSUPPORT; -int manager_dns_ipv6_recv(Manager *m, DnsPacket **ret) { - _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - struct msghdr mh = {}; - struct iovec iov; - int fd, ms = 0, r; - ssize_t l; + for (cmsg = CMSG_FIRSTHDR(&mh); cmsg; cmsg = CMSG_NXTHDR(&mh, cmsg)) { - assert(m); - assert(ret); + if (cmsg->cmsg_level == IPPROTO_IPV6) { + assert(p->family == AF_INET6); - fd = manager_dns_ipv6_fd(m); - if (fd < 0) - return fd; + switch (cmsg->cmsg_type) { - r = ioctl(fd, FIONREAD, &ms); - if (r < 0) - return -errno; - if (ms < 0) - return -EIO; + case IPV6_PKTINFO: { + struct in6_pktinfo *i = (struct in6_pktinfo*) CMSG_DATA(cmsg); - r = dns_packet_new(&p, ms); - if (r < 0) - return r; + p->ifindex = i->ipi6_ifindex; + p->destination.in6 = i->ipi6_addr; + break; + } - iov.iov_base = DNS_PACKET_DATA(p); - iov.iov_len = p->allocated; + case IPV6_HOPLIMIT: + p->ttl = *(int *) CMSG_DATA(cmsg); + break; - mh.msg_iov = &iov; - mh.msg_iovlen = 1; + } + } else if (cmsg->cmsg_level == IPPROTO_IP) { + assert(p->family == AF_INET); - l = recvmsg(fd, &mh, 0); - if (l < 0) { - if (errno == EAGAIN || errno == EINTR) - return 0; + switch (cmsg->cmsg_type) { - return -errno; - } + case IP_PKTINFO: { + struct in_pktinfo *i = (struct in_pktinfo*) CMSG_DATA(cmsg); - if (l <= 0) - return -EIO; + p->ifindex = i->ipi_ifindex; + p->destination.in = i->ipi_addr; + break; + } - p->size = (size_t) l; + case IP_RECVTTL: + p->ttl = *(int *) CMSG_DATA(cmsg); + break; + } + } + } *ret = p; p = NULL; @@ -637,43 +648,30 @@ int manager_dns_ipv6_recv(Manager *m, DnsPacket **ret) { return 1; } -static int on_dns_ipv4_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { +static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; DnsQueryTransaction *t = NULL; Manager *m = userdata; int r; - r = manager_dns_ipv4_recv(m, &p); + r = manager_recv(m, fd, DNS_PROTOCOL_DNS, &p); if (r <= 0) return r; - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); - if (!t) - return 0; - - dns_query_transaction_reply(t, p); - return 0; -} - -static int on_dns_ipv6_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - DnsQueryTransaction *t = NULL; - Manager *m = userdata; - int r; - - r = manager_dns_ipv6_recv(m, &p); - if (r <= 0) - return r; + if (dns_packet_validate_reply(p) >= 0) { + t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + if (!t) + return 0; - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); - if (!t) - return 0; + dns_query_transaction_process_reply(t, p); + } else + log_debug("Invalid reply packet."); - dns_query_transaction_reply(t, p); return 0; } int manager_dns_ipv4_fd(Manager *m) { + const int one = 1; int r; assert(m); @@ -685,14 +683,25 @@ int manager_dns_ipv4_fd(Manager *m) { if (m->dns_ipv4_fd < 0) return -errno; - r = sd_event_add_io(m->event, &m->dns_ipv4_event_source, m->dns_ipv4_fd, EPOLLIN, on_dns_ipv4_packet, m); + r = setsockopt(m->dns_ipv4_fd, IPPROTO_IP, IP_PKTINFO, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = sd_event_add_io(m->event, &m->dns_ipv4_event_source, m->dns_ipv4_fd, EPOLLIN, on_dns_packet, m); if (r < 0) - return r; + goto fail; return m->dns_ipv4_fd; + +fail: + m->dns_ipv4_fd = safe_close(m->dns_ipv4_fd); + return r; } int manager_dns_ipv6_fd(Manager *m) { + const int one = 1; int r; assert(m); @@ -704,11 +713,21 @@ int manager_dns_ipv6_fd(Manager *m) { if (m->dns_ipv6_fd < 0) return -errno; - r = sd_event_add_io(m->event, &m->dns_ipv6_event_source, m->dns_ipv6_fd, EPOLLIN, on_dns_ipv6_packet, m); + r = setsockopt(m->dns_ipv6_fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = sd_event_add_io(m->event, &m->dns_ipv6_event_source, m->dns_ipv6_fd, EPOLLIN, on_dns_packet, m); if (r < 0) - return r; + goto fail; return m->dns_ipv6_fd; + +fail: + m->dns_ipv6_fd = safe_close(m->dns_ipv6_fd); + return r; } static int sendmsg_loop(int fd, struct msghdr *mh, int flags) { @@ -735,28 +754,28 @@ static int sendmsg_loop(int fd, struct msghdr *mh, int flags) { } } -int manager_dns_ipv4_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) { +static int manager_ipv4_send(Manager *m, int fd, int ifindex, struct in_addr *addr, uint16_t port, DnsPacket *p) { union sockaddr_union sa = { .in.sin_family = AF_INET, - .in.sin_port = htobe16(53), }; + union { + struct cmsghdr header; /* For alignment */ + uint8_t buffer[CMSG_SPACE(sizeof(struct in_pktinfo))]; + } control; struct msghdr mh = {}; struct iovec iov; - uint8_t control[CMSG_SPACE(sizeof(struct in_pktinfo))]; - int fd; assert(m); - assert(srv); + assert(fd >= 0); + assert(addr); + assert(port > 0); assert(p); - fd = manager_dns_ipv4_fd(m); - if (fd < 0) - return fd; - iov.iov_base = DNS_PACKET_DATA(p); iov.iov_len = p->size; - sa.in.sin_addr = srv->address.in; + sa.in.sin_addr = *addr; + sa.in.sin_port = htobe16(port), mh.msg_iov = &iov; mh.msg_iovlen = 1; @@ -769,7 +788,7 @@ int manager_dns_ipv4_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) zero(control); - mh.msg_control = control; + mh.msg_control = &control; mh.msg_controllen = CMSG_LEN(sizeof(struct in_pktinfo)); cmsg = CMSG_FIRSTHDR(&mh); @@ -784,29 +803,28 @@ int manager_dns_ipv4_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) return sendmsg_loop(fd, &mh, 0); } -int manager_dns_ipv6_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) { +static int manager_ipv6_send(Manager *m, int fd, int ifindex, struct in6_addr *addr, uint16_t port, DnsPacket *p) { union sockaddr_union sa = { .in6.sin6_family = AF_INET6, - .in6.sin6_port = htobe16(53), }; - + union { + struct cmsghdr header; /* For alignment */ + uint8_t buffer[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + } control; struct msghdr mh = {}; struct iovec iov; - uint8_t control[CMSG_SPACE(sizeof(struct in6_pktinfo))]; - int fd; assert(m); - assert(srv); + assert(fd >= 0); + assert(addr); + assert(port > 0); assert(p); - fd = manager_dns_ipv6_fd(m); - if (fd < 0) - return fd; - iov.iov_base = DNS_PACKET_DATA(p); iov.iov_len = p->size; - sa.in6.sin6_addr = srv->address.in6; + sa.in6.sin6_addr = *addr; + sa.in6.sin6_port = htobe16(port), sa.in6.sin6_scope_id = ifindex; mh.msg_iov = &iov; @@ -820,7 +838,7 @@ int manager_dns_ipv6_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) zero(control); - mh.msg_control = control; + mh.msg_control = &control; mh.msg_controllen = CMSG_LEN(sizeof(struct in6_pktinfo)); cmsg = CMSG_FIRSTHDR(&mh); @@ -835,7 +853,23 @@ int manager_dns_ipv6_send(Manager *m, DnsServer *srv, int ifindex, DnsPacket *p) return sendmsg_loop(fd, &mh, 0); } -DnsServer* manager_find_dns_server(Manager *m, unsigned char family, union in_addr_union *in_addr) { +int manager_send(Manager *m, int fd, int ifindex, int family, union in_addr_union *addr, uint16_t port, DnsPacket *p) { + assert(m); + assert(fd >= 0); + assert(addr); + assert(port > 0); + assert(p); + + if (family == AF_INET) + return manager_ipv4_send(m, fd, ifindex, &addr->in, port, p); + else if (family == AF_INET6) + return manager_ipv6_send(m, fd, ifindex, &addr->in6, port, p); + + return -EAFNOSUPPORT; +} + + +DnsServer* manager_find_dns_server(Manager *m, int family, union in_addr_union *in_addr) { DnsServer *s; assert(m); @@ -898,3 +932,179 @@ uint32_t manager_find_mtu(Manager *m) { return mtu; } + +static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { + _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; + DnsQueryTransaction *t = NULL; + Manager *m = userdata; + int r; + + r = manager_recv(m, fd, DNS_PROTOCOL_LLMNR, &p); + if (r <= 0) + return r; + + if (dns_packet_validate_reply(p) >= 0) { + t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + if (!t) + return 0; + + dns_query_transaction_process_reply(t, p); + } + + return 0; +} + +int manager_llmnr_ipv4_udp_fd(Manager *m) { + union sockaddr_union sa = { + .in.sin_family = AF_INET, + .in.sin_port = htobe16(5355), + }; + static const int one = 1, pmtu = IP_PMTUDISC_DONT; + int r; + + assert(m); + + if (m->llmnr_ipv4_udp_fd >= 0) + return m->llmnr_ipv4_udp_fd; + + m->llmnr_ipv4_udp_fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); + if (m->llmnr_ipv4_udp_fd < 0) + return -errno; + + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_TTL, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_MULTICAST_TTL, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_MULTICAST_LOOP, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv4_udp_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_PKTINFO, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_RECVTTL, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + /* Disable Don't-Fragment bit in the IP header */ + r = setsockopt(m->llmnr_ipv4_udp_fd, IPPROTO_IP, IP_MTU_DISCOVER, &pmtu, sizeof(pmtu)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = bind(m->llmnr_ipv4_udp_fd, &sa.sa, sizeof(sa.in)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = sd_event_add_io(m->event, &m->llmnr_ipv4_udp_event_source, m->llmnr_ipv4_udp_fd, EPOLLIN, on_llmnr_packet, m); + if (r < 0) + goto fail; + + return m->llmnr_ipv4_udp_fd; + +fail: + m->llmnr_ipv4_udp_fd = safe_close(m->llmnr_ipv4_udp_fd); + return r; +} + +int manager_llmnr_ipv6_udp_fd(Manager *m) { + union sockaddr_union sa = { + .in6.sin6_family = AF_INET6, + .in6.sin6_port = htobe16(5355), + }; + static const int one = 1; + int r; + + assert(m); + + if (m->llmnr_ipv6_udp_fd >= 0) + return m->llmnr_ipv6_udp_fd; + + m->llmnr_ipv6_udp_fd = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); + if (m->llmnr_ipv6_udp_fd < 0) + return -errno; + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = setsockopt(m->llmnr_ipv6_udp_fd, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &one, sizeof(one)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = bind(m->llmnr_ipv6_udp_fd, &sa.sa, sizeof(sa.in6)); + if (r < 0) { + r = -errno; + goto fail; + } + + r = sd_event_add_io(m->event, &m->llmnr_ipv6_udp_event_source, m->llmnr_ipv6_udp_fd, EPOLLIN, on_llmnr_packet, m); + if (r < 0) { + r = -errno; + goto fail; + } + + return m->llmnr_ipv6_udp_fd; + +fail: + m->llmnr_ipv6_udp_fd = safe_close(m->llmnr_ipv6_udp_fd); + return r; +}