X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=dns.c;h=89cd4ce5a76fc4ebd736784cf6d6fcbe4180bf0d;hp=1ff5d530f9e4f7d61775ec487b958eb25c57dbcc;hb=426330fffb024d3c2e4c6e34a16b04afef884d5d;hpb=3032203ee12cf5344f89b1ae1ee78229a44f8959

diff --git a/dns.c b/dns.c
index 1ff5d53..89cd4ce 100644
--- a/dns.c
+++ b/dns.c
@@ -39,6 +39,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*
@@ -76,7 +77,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,
@@ -89,7 +90,7 @@ dns_send_question(struct interface *iface, const char *question, int type, int u
 	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);
+	len = dn_comp(question, (void *) dns_buffer, sizeof(dns_buffer), NULL, NULL);
 	if (len < 1)
 		return;
 
@@ -299,6 +300,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");
@@ -309,7 +313,7 @@ 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, buffer, len, name, a, rdata, a->class & CLASS_FLUSH);
 
 	return 0;
 }
@@ -331,7 +335,7 @@ parse_question(struct interface *iface, char *name, struct dns_question *q)
 		break;
 
 	case TYPE_PTR:
-		service_announce_services(iface, name);
+		service_announce_services(iface, name, announce_ttl);
 		service_reply(iface, name, announce_ttl);
 		break;
 
@@ -341,13 +345,13 @@ parse_question(struct interface *iface, char *name, struct dns_question *q)
 		if (host)
 			*host = '\0';
 		if (!strcmp(mdns_hostname, name))
-			service_reply_a(iface, q->type, announce_ttl);
+			service_reply_a(iface, 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 *s, uint16_t port, uint8_t *buffer, int len)
 {
 	struct dns_header *h;
 	uint8_t *b = buffer;
@@ -359,6 +363,10 @@ dns_handle_packet(struct interface *iface, uint8_t *buffer, int len, int unicast
 		return;
 	}
 
+	if (h->questions && !iface->multicast && port != 5353)
+		// 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;