X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmdnsd.git;a=blobdiff_plain;f=dns.c;h=51a015056d3a4d41d9c80e56488ff97f090905a7;hp=63788f73ebdb708ea66ac2e83e920e152ca68aed;hb=9f1cc226e4be47d32e4df796c94cbee1437960aa;hpb=9bbaf3c1f7826a7ac637ac0e2e7c8d5b43bac89d

diff --git a/dns.c b/dns.c
index 63788f7..51a0150 100644
--- a/dns.c
+++ b/dns.c
@@ -15,6 +15,7 @@
 #include <sys/stat.h>
 
 #include <fcntl.h>
+#include <ifaddrs.h>
 #include <time.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -97,8 +98,8 @@ 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, iov, ARRAY_SIZE(iov)) < 0)
-		perror("failed to send question :");
+	if (interface_send_packet(iface, NULL, iov, ARRAY_SIZE(iov)) < 0)
+		perror("failed to send question");
 }
 
 
@@ -137,7 +138,7 @@ dns_add_answer(int type, const uint8_t *rdata, uint16_t rdlength, int ttl)
 }
 
 void
-dns_send_answer(struct interface *iface, const char *answer)
+dns_send_answer(struct interface *iface, struct sockaddr *to, const char *answer)
 {
 	uint8_t buffer[256];
 	struct blob_attr *attr;
@@ -176,8 +177,37 @@ dns_send_answer(struct interface *iface, const char *answer)
 		DBG(1, "A <- %s %s\n", dns_type_string(be16_to_cpu(a->type)), answer);
 	}
 
-	if (interface_send_packet(iface, iov, n_iov) < 0)
-		fprintf(stderr, "failed to send question\n");
+	if (interface_send_packet(iface, to, iov, n_iov) < 0)
+		perror("failed to send answer");
+}
+
+void
+dns_reply_a(struct interface *iface, struct sockaddr *to, int ttl)
+{
+	struct ifaddrs *ifap, *ifa;
+	struct sockaddr_in *sa;
+	struct sockaddr_in6 *sa6;
+
+	getifaddrs(&ifap);
+
+	dns_init_answer();
+	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+		if (strcmp(ifa->ifa_name, iface->name))
+			continue;
+		if (ifa->ifa_addr->sa_family == AF_INET) {
+			sa = (struct sockaddr_in *) ifa->ifa_addr;
+			dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, ttl);
+		}
+		if (ifa->ifa_addr->sa_family == AF_INET6) {
+			uint8_t ll_prefix[] = {0xfe, 0x80 };
+			sa6 = (struct sockaddr_in6 *) ifa->ifa_addr;
+			if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2))
+				dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, ttl);
+		}
+	}
+	dns_send_answer(iface, to, mdns_hostname_local);
+
+	freeifaddrs(ifap);
 }
 
 static int
@@ -319,24 +349,43 @@ parse_answer(struct interface *iface, uint8_t *buffer, int len, uint8_t **b, int
 }
 
 static void
-parse_question(struct interface *iface, char *name, struct dns_question *q)
+parse_question(struct interface *iface, struct sockaddr *from, char *name, struct dns_question *q)
 {
+	struct sockaddr *to = NULL;
 	char *host;
 
-	if ((q->class & CLASS_UNICAST) && iface->multicast)
-		iface = iface->peer;
+	/* TODO: Multicast if more than one quarter of TTL has passed */
+	if (q->class & CLASS_UNICAST) {
+		to = from;
+		if (iface->multicast)
+			iface = iface->peer;
+	}
 
 	DBG(1, "Q -> %s %s\n", dns_type_string(q->type), name);
 
 	switch (q->type) {
 	case TYPE_ANY:
-		if (!strcmp(name, mdns_hostname_local))
-			service_reply(iface, NULL, announce_ttl);
+		if (!strcmp(name, mdns_hostname_local)) {
+			dns_reply_a(iface, to, announce_ttl);
+			service_reply(iface, to, NULL, announce_ttl);
+		}
 		break;
 
 	case TYPE_PTR:
-		service_announce_services(iface, name, announce_ttl);
-		service_reply(iface, name, announce_ttl);
+		if (!strcmp(name, C_DNS_SD)) {
+			dns_reply_a(iface, to, announce_ttl);
+			service_announce_services(iface, to, announce_ttl);
+		} else {
+			/* First dot separates instance name from the rest */
+			char *dot = strchr(name, '.');
+			/* Length of queried instance */
+			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))
+				service_reply(iface, to, dot + 1, announce_ttl);
+		}
 		break;
 
 	case TYPE_AAAA:
@@ -345,7 +394,7 @@ parse_question(struct interface *iface, char *name, struct dns_question *q)
 		if (host)
 			*host = '\0';
 		if (!strcmp(mdns_hostname, name))
-			service_reply_a(iface, announce_ttl);
+			dns_reply_a(iface, to, announce_ttl);
 		break;
 	};
 }
@@ -363,8 +412,8 @@ dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, ui
 		return;
 	}
 
-	if (h->questions && !iface->multicast && port != 5353)
-		// silently drop unicast questions that dont originate from port 5353  
+	if (h->questions && !iface->multicast && port != MCAST_PORT)
+		/* silently drop unicast questions that dont originate from port 5353 */
 		return;
 
 	while (h->questions-- > 0) {
@@ -383,7 +432,7 @@ dns_handle_packet(struct interface *iface, struct sockaddr *s, uint16_t port, ui
 		}
 
 		if (!(h->flags & FLAG_RESPONSE))
-			parse_question(iface, name, q);
+			parse_question(iface, s, name, q);
 	}
 
 	if (!(h->flags & FLAG_RESPONSE))