#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/byteorder.h>
#include <arpa/nameser.h>
#include <resolv.h>
#include <stdlib.h>
#include "interface.h"
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)
{
- 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,
};
int len;
- q.type = __cpu_to_be16(type);
+ h.questions = cpu_to_be16(1);
+ q.class = cpu_to_be16(1);
+ q.type = cpu_to_be16(type);
len = dn_comp(question, (void *) name_buffer, sizeof(name_buffer), NULL, NULL);
if (len < 1)
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++;
}
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);
-
- iov = alloca(sizeof(struct iovec) * ((dns_answer_cnt * 3) + 1));
- iov[0].iov_base = &h;
- iov[0].iov_len = sizeof(struct dns_header);
+ h.answers = cpu_to_be16(dns_answer_cnt);
+ h.flags = cpu_to_be16(0x8400);
- for (i = 0; i < dns_answer_cnt; i++) {
- struct dns_answer *a = &dns_reply[i].a;
- int id = (i * 3) + 1;
+ iov = alloca(sizeof(struct iovec) * ((dns_answer_cnt * 2) + 1));
- 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);
+ iov[n_iov].iov_base = &h;
+ iov[n_iov].iov_len = sizeof(struct dns_header);
+ n_iov++;
- 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
return NULL;
while (endianess--) {
- *swap = __be16_to_cpu(*swap);
+ *swap = be16_to_cpu(*swap);
swap++;
}
return NULL;
while (endianess--) {
- *swap = __be16_to_cpu(*swap);
+ *swap = be16_to_cpu(*swap);
swap++;
}
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);
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_reply(iface, name, announce_ttl);
break;
case TYPE_AAAA:
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, q->type, announce_ttl);
break;
};
}
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;
+
}
projects / project / mdnsd.git / blobdiff