ubus: add ubus fetch call

Signed-off-by: Steven Barth <steven@midlink.org>

diff --git a/cache.c b/cache.c
index 59d5b940a2e71d9ead48b32f84fedf366ca7b1c5..2bf8257df0982e82f98cb8c20371be8d30157317 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -402,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);
+               }
+       }
+}

diff --git a/cache.h b/cache.h
index f11466560fe76a130241860e13b20a4878a1802e..d433fae7041b4431f6e462616135ea931337a48a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -56,5 +56,6 @@ void cache_answer(struct interface *iface, uint8_t *base, int blen,
 int cache_host_is_known(char *record);
 char *cache_lookup_name(const char *key);
 void cache_dump_records(struct blob_buf *buf, const char *name);
+void cache_dump_recursive(struct blob_buf *b, const char *name, uint16_t type, struct interface *iface);
 
 #endif

diff --git a/ubus.c b/ubus.c
index ebd31573d307e61ae7ad5afd0df7832dd3c1904e..53812082676deefc4a14047de85c137663be5f32 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -189,19 +189,31 @@ mdns_query(struct ubus_context *ctx, struct ubus_object *obj,
        if (!iface_v4 && !iface_v6)
                return UBUS_STATUS_NOT_FOUND;
 
-       if (iface_v4)
-               dns_send_question(iface_v4, question, type, 0);
-
-       if (iface_v6)
-               dns_send_question(iface_v6, question, type, 0);
-
-       return UBUS_STATUS_OK;
+       if (!strcmp(method, "query")) {
+               if (iface_v4)
+                       dns_send_question(iface_v4, question, type, 0);
+
+               if (iface_v6)
+                       dns_send_question(iface_v6, question, type, 0);
+
+               return UBUS_STATUS_OK;
+       } else if (!strcmp(method, "fetch")) {
+               blob_buf_init(&b, 0);
+               void *k = blobmsg_open_array(&b, "records");
+               cache_dump_recursive(&b, question, type, iface_v4 ? iface_v4 : iface_v6);
+               blobmsg_close_array(&b, k);
+               ubus_send_reply(ctx, req, b.head);
+               return UBUS_STATUS_OK;
+       } else {
+               return UBUS_STATUS_INVALID_ARGUMENT;
+       }
 }
 
 
 static const struct ubus_method mdns_methods[] = {
        UBUS_METHOD("set_config", mdns_set_config, config_policy),
        UBUS_METHOD("query", mdns_query, query_policy),
+       UBUS_METHOD("fetch", mdns_query, query_policy),
        UBUS_METHOD_NOARG("scan", mdns_scan),
        UBUS_METHOD_NOARG("browse", mdns_browse),
        UBUS_METHOD_NOARG("hosts", mdns_hosts),