X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=dns.c;h=68a088f7fba6ba62fa6e8a981dedb714821c21b7;hp=2e8b0ba0a3da483e9b7a0f6c04d442b6aa7434b5;hb=ff09d9a4f9885b8160577c79e6349bfee05452f8;hpb=ce7e9e939dbf4e100bfece5a46b3ef17fd99d034

diff --git a/dns.c b/dns.c
index 2e8b0ba..68a088f 100644
--- a/dns.c
+++ b/dns.c
@@ -68,7 +68,8 @@ dns_type_string(uint16_t type)
 }
 
 void
-dns_send_question(struct interface *iface, const char *question, int type, int multicast)
+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;
@@ -98,7 +99,7 @@ dns_send_question(struct interface *iface, const char *question, int type, int m
 	iov[1].iov_len = len;
 
 	DBG(1, "Q <- %s %s\n", dns_type_string(type), question);
-	if (interface_send_packet(iface, NULL, iov, ARRAY_SIZE(iov)) < 0)
+	if (interface_send_packet(iface, to, iov, ARRAY_SIZE(iov)) < 0)
 		perror("failed to send question");
 }
 
@@ -312,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;
@@ -343,7 +345,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, a->class & CLASS_FLUSH);
+		cache_answer(iface, from, buffer, len, name, a, rdata, a->class & CLASS_FLUSH);
 
 	return 0;
 }
@@ -351,15 +353,14 @@ parse_answer(struct interface *iface, uint8_t *buffer, int len, uint8_t **b, int
 static void
 parse_question(struct interface *iface, struct sockaddr *from, char *name, struct dns_question *q)
 {
-	struct sockaddr *to;
+	struct sockaddr *to = NULL;
 	char *host;
 
 	/* TODO: Multicast if more than one quarter of TTL has passed */
-	if ((q->class & CLASS_UNICAST) && iface->multicast) {
-		iface = iface->peer;
+	if (q->class & CLASS_UNICAST) {
 		to = from;
-	} else {
-		to = NULL;
+		if (iface->multicast)
+			iface = iface->peer;
 	}
 
 	DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name);
@@ -383,8 +384,8 @@ parse_question(struct interface *iface, struct sockaddr *from, char *name, struc
 			size_t len = dot ? dot - name : 0;
 
 			/* Make sure it's query for the instance name we use */
-			if (len && len == strlen(mdns_hostname) &&
-			    !strncmp(name, mdns_hostname, len))
+			if (len && len == strlen(umdns_host_label) &&
+			    !strncmp(name, umdns_host_label, len))
 				service_reply(iface, to, dot + 1, announce_ttl);
 		}
 		break;
@@ -394,14 +395,14 @@ parse_question(struct interface *iface, struct sockaddr *from, char *name, struc
 		host = strstr(name, ".local");
 		if (host)
 			*host = '\0';
-		if (!strcmp(mdns_hostname, name))
+		if (!strcmp(umdns_host_label, name))
 			dns_reply_a(iface, to, announce_ttl);
 		break;
 	};
 }
 
 void
-dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, uint8_t *buffer, int len)
+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;
@@ -413,7 +414,7 @@ dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, ui
 		return;
 	}
 
-	if (h->questions && !iface->multicast && port != 5353)
+	if (h->questions && !iface->multicast && port != MCAST_PORT)
 		/* silently drop unicast questions that dont originate from port 5353 */
 		return;
 
@@ -433,22 +434,22 @@ dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, ui
 		}
 
 		if (!(h->flags & FLAG_RESPONSE))
-			parse_question(iface, s, 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;
 
 }