X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=dns.c;h=df855ebdeb189f86393de41eb0efef65da12765f;hb=e340a84950686428ecc7f46dbe28eba5c39a9095;hp=c1c280341449331bcf39d1efb0d0ba59692d4246;hpb=67e8c3bed831f8a1b879a654ca290d14e333664a;p=project%2Fmdnsd.git diff --git a/dns.c b/dns.c index c1c2803..df855eb 100644 --- a/dns.c +++ b/dns.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -39,44 +38,38 @@ #include "service.h" #include "interface.h" -char rdata_buffer[MAX_DATA_LEN + 1]; static char name_buffer[MAX_NAME_LEN + 1]; +static struct blob_buf ans_buf; const char* dns_type_string(uint16_t type) { - switch (type) { - case TYPE_A: - return "A"; - - case TYPE_AAAA: - return "AAAA"; - - case TYPE_PTR: - return "PTR"; - - case TYPE_TXT: - return "TXT"; - - case TYPE_SRV: - return "SRV"; + static const struct { + uint16_t type; + char str[5]; + } type_str[] = { + { TYPE_A, "A" }, + { TYPE_AAAA, "AAAA" }, + { TYPE_PTR, "PTR" }, + { TYPE_TXT, "TXT" }, + { TYPE_SRV, "SRV" }, + { TYPE_ANY, "ANY" }, + }; + int i; - case TYPE_ANY: - return "ANY"; + for (i = 0; i < ARRAY_SIZE(type_str); i++) { + if (type == type_str[i].type) + return type_str[i].str; } return "N/A"; } void -dns_send_question(struct interface *iface, const char *question, int type) +dns_send_question(struct interface *iface, const char *question, int type, int unicast) { - static struct dns_header h = { - .questions = cpu_to_be16(1), - }; - static struct dns_question q = { - .class = cpu_to_be16(1), - }; + static struct dns_header h; + static struct dns_question q; static struct iovec iov[] = { { .iov_base = &h, @@ -92,7 +85,9 @@ dns_send_question(struct interface *iface, const char *question, int type) }; int len; - q.type = __cpu_to_be16(type); + h.questions = cpu_to_be16(1); + q.class = cpu_to_be16(((unicast) ? (CLASS_UNICAST) : (0)) | 1); + q.type = cpu_to_be16(type); len = dn_comp(question, (void *) name_buffer, sizeof(name_buffer), NULL, NULL); if (len < 1) @@ -100,10 +95,9 @@ dns_send_question(struct interface *iface, const char *question, int type) iov[1].iov_len = len; + DBG(1, "Q <- %s %s\n", dns_type_string(type), question); 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); + perror("failed to send question :"); } @@ -115,25 +109,29 @@ struct dns_reply { char *buffer; }; -#define MAX_ANSWER 8 -static struct dns_reply dns_reply[1 + (MAX_ANSWER * 3)]; static int dns_answer_cnt; void dns_init_answer(void) { dns_answer_cnt = 0; + blob_buf_init(&ans_buf, 0); } void -dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength) +dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength, int ttl) { - struct dns_reply *a = &dns_reply[dns_answer_cnt]; - if (dns_answer_cnt == MAX_ANSWER) - return; - a->rdata = memdup(rdata, rdlength); - a->type = type; - a->rdlength = rdlength; + struct blob_attr *attr; + struct dns_answer *a; + + attr = blob_new(&ans_buf, 0, sizeof(*a) + rdlength); + a = blob_data(attr); + a->type = cpu_to_be16(type); + a->class = cpu_to_be16(1); + a->ttl = cpu_to_be32(ttl); + a->rdlength = cpu_to_be16(rdlength); + memcpy(a + 1, rdata, rdlength); + dns_answer_cnt++; } @@ -141,54 +139,44 @@ void dns_send_answer(struct interface *iface, const char *answer) { uint8_t buffer[256]; + struct blob_attr *attr; struct dns_header h = { 0 }; struct iovec *iov; - int len, i; + int answer_len, rem; + int n_iov = 0; if (!dns_answer_cnt) return; - h.answers = __cpu_to_be16(dns_answer_cnt); - h.flags = __cpu_to_be16(0x8400); + h.answers = cpu_to_be16(dns_answer_cnt); + h.flags = cpu_to_be16(0x8400); - iov = alloca(sizeof(struct iovec) * ((dns_answer_cnt * 3) + 1)); - iov[0].iov_base = &h; - iov[0].iov_len = sizeof(struct dns_header); + iov = alloca(sizeof(struct iovec) * ((dns_answer_cnt * 2) + 1)); - for (i = 0; i < dns_answer_cnt; i++) { - struct dns_answer *a = &dns_reply[i].a; - int id = (i * 3) + 1; + iov[n_iov].iov_base = &h; + iov[n_iov].iov_len = sizeof(struct dns_header); + n_iov++; - memset(a, 0, sizeof(*a)); - a->type = __cpu_to_be16(dns_reply[i].type); - a->class = __cpu_to_be16(1); - a->ttl = __cpu_to_be32(announce_ttl); - a->rdlength = __cpu_to_be16(dns_reply[i].rdlength); - - len = dn_comp(answer, buffer, sizeof(buffer), NULL, NULL); - if (len < 1) - return; + answer_len = dn_comp(answer, buffer, sizeof(buffer), NULL, NULL); + if (answer_len < 1) + return; - dns_reply[i].buffer = iov[id].iov_base = memdup(buffer, len); - iov[id].iov_len = len; + blob_for_each_attr(attr, ans_buf.head, rem) { + struct dns_answer *a = blob_data(attr); - iov[id + 1].iov_base = a; - iov[id + 1].iov_len = sizeof(struct dns_answer); + iov[n_iov].iov_base = buffer; + iov[n_iov].iov_len = answer_len; + n_iov++; - iov[id + 2].iov_base = dns_reply[i].rdata; - iov[id + 2].iov_len = dns_reply[i].rdlength; + iov[n_iov].iov_base = blob_data(attr); + iov[n_iov].iov_len = blob_len(attr); + n_iov++; - DBG(1, "A <- %s %s\n", dns_type_string(dns_reply[i].type), answer); + DBG(1, "A <- %s %s\n", dns_type_string(be16_to_cpu(a->type)), answer); } - if (interface_send_packet(iface, iov, (dns_answer_cnt * 3) + 1) < 0) + if (interface_send_packet(iface, iov, n_iov) < 0) fprintf(stderr, "failed to send question\n"); - - for (i = 0; i < dns_answer_cnt; i++) { - free(dns_reply[i].buffer); - free(dns_reply[i].rdata); - } - dns_answer_cnt = 0; } static int @@ -224,7 +212,7 @@ dns_consume_header(uint8_t **data, int *len) return NULL; while (endianess--) { - *swap = __be16_to_cpu(*swap); + *swap = be16_to_cpu(*swap); swap++; } @@ -245,7 +233,7 @@ dns_consume_question(uint8_t **data, int *len) return NULL; while (endianess--) { - *swap = __be16_to_cpu(*swap); + *swap = be16_to_cpu(*swap); swap++; } @@ -263,10 +251,10 @@ dns_consume_answer(uint8_t **data, int *len) if (*len < sizeof(struct dns_answer)) return NULL; - a->type = __be16_to_cpu(a->type); - a->class = __be16_to_cpu(a->class); - a->ttl = __be32_to_cpu(a->ttl); - a->rdlength = __be16_to_cpu(a->rdlength); + a->type = be16_to_cpu(a->type); + a->class = be16_to_cpu(a->class); + a->ttl = be32_to_cpu(a->ttl); + a->rdlength = be16_to_cpu(a->rdlength); *len -= sizeof(struct dns_answer); *data += sizeof(struct dns_answer); @@ -331,18 +319,20 @@ parse_question(struct interface *iface, char *name, struct dns_question *q) { char *host; + if ((q->class & CLASS_UNICAST) && iface->multicast) + iface = iface->peer; + DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name); switch (q->type) { case TYPE_ANY: - host = service_name("local"); - if (!strcmp(name, host)) - service_reply(iface, NULL); + if (!strcmp(name, mdns_hostname_local)) + service_reply(iface, NULL, announce_ttl); break; case TYPE_PTR: - service_announce_services(iface, name); - service_reply(iface, name); + service_announce_services(iface, name, announce_ttl); + service_reply(iface, name, announce_ttl); break; case TYPE_AAAA: @@ -350,14 +340,14 @@ parse_question(struct interface *iface, char *name, struct dns_question *q) host = strstr(name, ".local"); if (host) *host = '\0'; - if (!strcmp(hostname, name)) - service_reply_a(iface, q->type); + if (!strcmp(mdns_hostname, name)) + service_reply_a(iface, announce_ttl); break; }; } void -dns_handle_packet(struct interface *iface, uint8_t *buffer, int len) +dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, uint8_t *buffer, int len) { struct dns_header *h; uint8_t *b = buffer; @@ -392,11 +382,15 @@ dns_handle_packet(struct interface *iface, uint8_t *buffer, int len) return; while (h->answers-- > 0) - parse_answer(iface, buffer, len, &b, &rlen, 1); + if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + return; while (h->authority-- > 0) - parse_answer(iface, buffer, len, &b, &rlen, 0); + if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + return; while (h->additional-- > 0) - parse_answer(iface, buffer, len, &b, &rlen, 1); + if (parse_answer(iface, buffer, len, &b, &rlen, 1)) + return; + }