X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=dns.c;h=df855ebdeb189f86393de41eb0efef65da12765f;hb=e340a84950686428ecc7f46dbe28eba5c39a9095;hp=0d192acf8faa439ffb3dbbef8af6d4aa2140a941;hpb=9091a2b0fa7f91be6d0d4b03ec8d7ef8cbe1e559;p=project%2Fmdnsd.git

diff --git a/dns.c b/dns.c
index 0d192ac..df855eb 100644
--- a/dns.c
+++ b/dns.c
@@ -66,7 +66,7 @@ dns_type_string(uint16_t type)
 }
 
 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;
 	static struct dns_question q;
@@ -86,7 +86,7 @@ dns_send_question(struct interface *iface, const char *question, int type)
 	int len;
 
 	h.questions = cpu_to_be16(1);
-	q.class = 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);
@@ -95,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 :");
 }
 
 
@@ -320,6 +319,9 @@ 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) {
@@ -329,7 +331,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;
 
@@ -339,13 +341,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)
+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;