X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=dns.c;h=bccaa29525fdafde1de30060050b769ecc04b6a5;hp=4f82849ef6f64e44c17a3ae5df7a6bc8f9818a19;hb=26ce7dca8085d34e6c3910680da51695f3508eec;hpb=6d1e112ec8f6dd6c1f594b028e2d0e0052d9d12f diff --git a/dns.c b/dns.c index 4f82849..bccaa29 100644 --- a/dns.c +++ b/dns.c @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -39,6 +40,7 @@ #include "interface.h" static char name_buffer[MAX_NAME_LEN + 1]; +static char dns_buffer[MAX_NAME_LEN]; static struct blob_buf ans_buf; const char* @@ -66,7 +68,8 @@ dns_type_string(uint16_t type) } void -dns_send_question(struct interface *iface, const char *question, int type, int unicast) +dns_send_question(struct interface *iface, struct sockaddr *to, + const char *question, int type, int multicast) { static struct dns_header h; static struct dns_question q; @@ -76,7 +79,7 @@ dns_send_question(struct interface *iface, const char *question, int type, int u .iov_len = sizeof(h), }, { - .iov_base = name_buffer, + .iov_base = dns_buffer, }, { .iov_base = &q, @@ -86,22 +89,18 @@ dns_send_question(struct interface *iface, const char *question, int type, int u int len; h.questions = cpu_to_be16(1); - q.class = cpu_to_be16(((unicast) ? (CLASS_UNICAST) : (0)) | 1); + q.class = cpu_to_be16((multicast ? 0 : CLASS_UNICAST) | 1); q.type = cpu_to_be16(type); - len = dn_comp(question, (void *) name_buffer, sizeof(name_buffer), NULL, NULL); + len = dn_comp(question, (void *) dns_buffer, sizeof(dns_buffer), NULL, NULL); if (len < 1) return; iov[1].iov_len = len; - if (unicast == iface->multicast) - iface = iface->peer; - - if (interface_send_packet(iface, iov, ARRAY_SIZE(iov)) < 0) - fprintf(stderr, "failed to send question\n"); - else - DBG(1, "Q <- %s %s\n", dns_type_string(type), question); + DBG(1, "Q <- %s %s\n", dns_type_string(type), question); + if (interface_send_packet(iface, to, iov, ARRAY_SIZE(iov)) < 0) + perror("failed to send question"); } @@ -140,7 +139,7 @@ dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength, int ttl) } void -dns_send_answer(struct interface *iface, const char *answer) +dns_send_answer(struct interface *iface, struct sockaddr *to, const char *answer) { uint8_t buffer[256]; struct blob_attr *attr; @@ -179,8 +178,37 @@ dns_send_answer(struct interface *iface, const char *answer) DBG(1, "A <- %s %s\n", dns_type_string(be16_to_cpu(a->type)), answer); } - if (interface_send_packet(iface, iov, n_iov) < 0) - fprintf(stderr, "failed to send question\n"); + if (interface_send_packet(iface, to, iov, n_iov) < 0) + perror("failed to send answer"); +} + +void +dns_reply_a(struct interface *iface, struct sockaddr *to, int ttl) +{ + struct ifaddrs *ifap, *ifa; + struct sockaddr_in *sa; + struct sockaddr_in6 *sa6; + + getifaddrs(&ifap); + + dns_init_answer(); + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (strcmp(ifa->ifa_name, iface->name)) + continue; + if (ifa->ifa_addr->sa_family == AF_INET) { + sa = (struct sockaddr_in *) ifa->ifa_addr; + dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, ttl); + } + if (ifa->ifa_addr->sa_family == AF_INET6) { + uint8_t ll_prefix[] = {0xfe, 0x80 }; + sa6 = (struct sockaddr_in6 *) ifa->ifa_addr; + if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2)) + dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, ttl); + } + } + dns_send_answer(iface, to, mdns_hostname_local); + + freeifaddrs(ifap); } static int @@ -285,8 +313,9 @@ dns_consume_name(const uint8_t *base, int blen, uint8_t **data, int *len) return name_buffer; } -static int -parse_answer(struct interface *iface, uint8_t *buffer, int len, uint8_t **b, int *rlen, int cache) +static int parse_answer(struct interface *iface, struct sockaddr *from, + uint8_t *buffer, int len, uint8_t **b, int *rlen, + int cache) { char *name = dns_consume_name(buffer, len, b, rlen); struct dns_answer *a; @@ -303,6 +332,9 @@ parse_answer(struct interface *iface, uint8_t *buffer, int len, uint8_t **b, int return -1; } + if ((a->class & ~CLASS_FLUSH) != CLASS_IN) + return -1; + rdata = *b; if (a->rdlength > *rlen) { fprintf(stderr, "dropping: bad question\n"); @@ -313,30 +345,49 @@ parse_answer(struct interface *iface, uint8_t *buffer, int len, uint8_t **b, int *b += a->rdlength; if (cache) - cache_answer(iface, buffer, len, name, a, rdata); + cache_answer(iface, from, buffer, len, name, a, rdata, a->class & CLASS_FLUSH); return 0; } static void -parse_question(struct interface *iface, char *name, struct dns_question *q) +parse_question(struct interface *iface, struct sockaddr *from, char *name, struct dns_question *q) { + struct sockaddr *to = NULL; char *host; - if ((q->class & CLASS_UNICAST) && iface->multicast) - iface = iface->peer; + /* TODO: Multicast if more than one quarter of TTL has passed */ + if (q->class & CLASS_UNICAST) { + to = from; + if (iface->multicast) + iface = iface->peer; + } DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name); switch (q->type) { case TYPE_ANY: - if (!strcmp(name, mdns_hostname_local)) - service_reply(iface, NULL, announce_ttl); + if (!strcmp(name, mdns_hostname_local)) { + dns_reply_a(iface, to, announce_ttl); + service_reply(iface, to, NULL, NULL, announce_ttl); + } break; case TYPE_PTR: - service_announce_services(iface, name); - service_reply(iface, name, announce_ttl); + if (!strcmp(name, C_DNS_SD)) { + dns_reply_a(iface, to, announce_ttl); + service_announce_services(iface, to, announce_ttl); + } else { + /* First dot separates instance name from the rest */ + char *dot = strchr(name, '.'); + /* Length of queried instance */ + size_t len = dot ? dot - name : 0; + + /* Make sure it's query for the instance name we use */ + if (len && len == strlen(umdns_host_label) && + !strncmp(name, umdns_host_label, len)) + service_reply(iface, to, NULL, dot + 1, announce_ttl); + } break; case TYPE_AAAA: @@ -344,14 +395,14 @@ parse_question(struct interface *iface, char *name, struct dns_question *q) host = strstr(name, ".local"); if (host) *host = '\0'; - if (!strcmp(mdns_hostname, name)) - service_reply_a(iface, q->type, announce_ttl); + if (!strcmp(umdns_host_label, name)) + dns_reply_a(iface, to, announce_ttl); break; }; } void -dns_handle_packet(struct interface *iface, uint8_t *buffer, int len, int unicast) +dns_handle_packet(struct interface *iface, struct sockaddr *from, uint16_t port, uint8_t *buffer, int len) { struct dns_header *h; uint8_t *b = buffer; @@ -363,6 +414,10 @@ dns_handle_packet(struct interface *iface, uint8_t *buffer, int len, int unicast return; } + if (h->questions && !iface->multicast && port != MCAST_PORT) + /* silently drop unicast questions that dont originate from port 5353 */ + return; + while (h->questions-- > 0) { char *name = dns_consume_name(buffer, len, &b, &rlen); struct dns_question *q; @@ -379,22 +434,22 @@ dns_handle_packet(struct interface *iface, uint8_t *buffer, int len, int unicast } if (!(h->flags & FLAG_RESPONSE)) - parse_question(iface, name, q); + parse_question(iface, from, name, q); } if (!(h->flags & FLAG_RESPONSE)) return; while (h->answers-- > 0) - if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + if (parse_answer(iface, from, buffer, len, &b, &rlen, 1)) return; while (h->authority-- > 0) - if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + if (parse_answer(iface, from, buffer, len, &b, &rlen, 1)) return; while (h->additional-- > 0) - if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + if (parse_answer(iface, from, buffer, len, &b, &rlen, 1)) return; }