X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=cache.c;h=2bf8257df0982e82f98cb8c20371be8d30157317;hb=000402bc86dacf2ffe64cdd376145fa8c7294e34;hp=11d359dff9c512c3608058bb150ea039d4a60181;hpb=42749216453719dc255c56ff72848b5472138a54;p=project%2Fmdnsd.git

diff --git a/cache.c b/cache.c
index 11d359d..2bf8257 100644
--- a/cache.c
+++ b/cache.c
@@ -261,13 +261,24 @@ cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
 			host_len = rdlength - nlen - 1;
 
 		cache_service(iface, rdata_buffer, host_len, a->ttl);
-		return;
+
+		dlen = strlen(rdata_buffer) + 1;
+		rdata = (uint8_t*)rdata_buffer;
+		break;
 
 	case TYPE_SRV:
 		if (a->rdlength < 8)
 			return;
 
 		port = be16_to_cpu(dsd->port);
+		memcpy(rdata_buffer, dsd, sizeof(*dsd));
+		if (dn_expand(base, base + blen, (const uint8_t*)&dsd[1],
+				&rdata_buffer[sizeof(*dsd)], MAX_DATA_LEN - sizeof(*dsd)) < 0) {
+			perror("process_answer/dn_expand");
+			return;
+		}
+		dlen = sizeof(*dsd) + strlen(&rdata_buffer[sizeof(*dsd)]) + 1;
+		rdata = (uint8_t*)rdata_buffer;
 		break;
 
 	case TYPE_TXT:
@@ -391,3 +402,76 @@ cache_dump_records(struct blob_buf *buf, const char *name)
 			break;
 	}
 }
+
+void
+cache_dump_recursive(struct blob_buf *b, const char *name, uint16_t type, struct interface *iface)
+{
+	time_t now = monotonic_time();
+	for (struct cache_record *r = avl_find_ge_element(&records, name, r, avl);
+			r && !strcmp(r->record, name);
+			r = !avl_is_last(&records, &r->avl) ? avl_next_element(r, avl) : NULL) {
+		int32_t ttl = r->ttl - (now - r->time);
+		if (ttl <= 0 || (iface && iface->ifindex != r->iface->ifindex) ||
+				(type != TYPE_ANY && type != r->type))
+			continue;
+
+		const char *txt;
+		char buf[INET6_ADDRSTRLEN];
+		void *k = blobmsg_open_table(b, NULL), *l;
+		const struct dns_srv_data *dsd = (const struct dns_srv_data*)r->rdata;
+
+		blobmsg_add_string(b, "name", r->record);
+		blobmsg_add_string(b, "type", dns_type_string(r->type));
+		blobmsg_add_u32(b, "ttl", ttl);
+
+		switch (r->type) {
+		case TYPE_TXT:
+			if ((txt = r->txt) && strlen(txt)) {
+				l = blobmsg_open_array(b, "data");
+				do {
+					blobmsg_add_string(b, NULL, txt);
+					txt = &txt[strlen(txt) + 1];
+				} while (*txt);
+				blobmsg_close_array(b, l);
+			}
+			break;
+
+		case TYPE_SRV:
+			if (r->rdlength > sizeof(*dsd)) {
+				blobmsg_add_u32(b, "priority", be16_to_cpu(dsd->priority));
+				blobmsg_add_u32(b, "weight", be16_to_cpu(dsd->weight));
+				blobmsg_add_u32(b, "port", be16_to_cpu(dsd->port));
+				blobmsg_add_string(b, "target", (const char*)&dsd[1]);
+			}
+			break;
+
+		case TYPE_PTR:
+			if (r->rdlength > 0)
+				blobmsg_add_string(b, "target", (const char*)r->rdata);
+			break;
+
+		case TYPE_A:
+			if ((r->rdlength == 4) && inet_ntop(AF_INET, r->rdata, buf, sizeof(buf)))
+				blobmsg_add_string(b, "target", buf);
+			break;
+
+		case TYPE_AAAA:
+			if ((r->rdlength == 16) && inet_ntop(AF_INET6, r->rdata, buf, sizeof(buf)))
+				blobmsg_add_string(b, "target", buf);
+			break;
+		}
+
+		blobmsg_close_table(b, k);
+
+
+		if (r->type == TYPE_PTR) {
+			cache_dump_recursive(b, (const char*)r->rdata, TYPE_SRV, iface);
+			cache_dump_recursive(b, (const char*)r->rdata, TYPE_TXT, iface);
+		}
+
+		if (r->type == TYPE_SRV) {
+			cache_dump_recursive(b, (const char*)&dsd[1], TYPE_A, iface);
+			cache_dump_recursive(b, (const char*)&dsd[1], TYPE_AAAA, iface);
+		}
+	}
+}