ubus: also allow dumping ipv4/6 as an array

[project/mdnsd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 0cfd18f4ce783ff3489bcc6d3f13e987a2dd6011..1ff816dcc38af78fcdc44f5a6591042f0a20730f 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -47,6 +47,17 @@ umdns_update(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+enum {
+       BROWSE_SERVICE,
+       BROWSE_ARRAY,
+       BROWSE_MAX
+};
+
+static const struct blobmsg_policy browse_policy[] = {
+       [BROWSE_SERVICE]        = { "service", BLOBMSG_TYPE_STRING },
+       [BROWSE_ARRAY]          = { "array", BLOBMSG_TYPE_BOOL },
+};
+
 static int
 umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
@@ -54,7 +65,16 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 {
        struct cache_service *s, *q;
        char *buffer = (char *) mdns_buf;
+       struct blob_attr *data[BROWSE_MAX];
        void *c1 = NULL, *c2;
+       char *service = NULL;
+       int array = 0;
+
+       blobmsg_parse(browse_policy, BROWSE_MAX, data, blob_data(msg), blob_len(msg));
+       if (data[BROWSE_SERVICE])
+               service = blobmsg_get_string(data[BROWSE_SERVICE]);
+       if (data[BROWSE_ARRAY])
+               array = blobmsg_get_u8(data[BROWSE_ARRAY]);
 
        blob_buf_init(&b, 0);
        avl_for_each_element(&services, s, avl) {
@@ -66,7 +86,8 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                        *local = '\0';
                if (!strcmp(buffer, "_tcp") || !strcmp(buffer, "_udp"))
                        continue;
-
+               if (service && strcmp(buffer, service))
+                       continue;
                if (!c1) {
                        c1 = blobmsg_open_table(&b, buffer);
                }
@@ -76,8 +97,8 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                        *local = '\0';
                c2 = blobmsg_open_table(&b, buffer);
                strncat(buffer, ".local", MAX_NAME_LEN);
-               cache_dump_records(&b, buffer);
-               cache_dump_records(&b, s->entry);
+               cache_dump_records(&b, buffer, array);
+               cache_dump_records(&b, s->entry, array);
                blobmsg_close_table(&b, c2);
                q = avl_next_element(s, avl);
                if (!q || avl_is_last(&services, &s->avl) || strcmp(s->avl.key, q->avl.key)) {
@@ -106,7 +127,7 @@ umdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
                /* Query each domain just once */
                if (!prev || strcmp(r->record, prev->record)) {
                        c = blobmsg_open_table(&b, r->record);
-                       cache_dump_records(&b, r->record);
+                       cache_dump_records(&b, r->record, false);
                        blobmsg_close_table(&b, c);
                }
                prev = r;
@@ -176,7 +197,7 @@ umdns_query(struct ubus_context *ctx, struct ubus_object *obj,
                    struct blob_attr *msg)
 {
        struct blob_attr *tb[QUERY_MAX], *c;
-       const char *question = "_services._dns-sd._udp.local";
+       const char *question = C_DNS_SD;
        const char *ifname;
        int type = TYPE_ANY;
 
@@ -201,10 +222,10 @@ umdns_query(struct ubus_context *ctx, struct ubus_object *obj,
 
        if (!strcmp(method, "query")) {
                if (iface_v4)
-                       dns_send_question(iface_v4, question, type, 1);
+                       dns_send_question(iface_v4, NULL, question, type, 1);
 
                if (iface_v6)
-                       dns_send_question(iface_v6, question, type, 1);
+                       dns_send_question(iface_v6, NULL, question, type, 1);
 
                return UBUS_STATUS_OK;
        } else if (!strcmp(method, "fetch")) {
@@ -224,8 +245,8 @@ static const struct ubus_method umdns_methods[] = {
        UBUS_METHOD("set_config", umdns_set_config, config_policy),
        UBUS_METHOD("query", umdns_query, query_policy),
        UBUS_METHOD("fetch", umdns_query, query_policy),
+       UBUS_METHOD("browse", umdns_browse, browse_policy),
        UBUS_METHOD_NOARG("update", umdns_update),
-       UBUS_METHOD_NOARG("browse", umdns_browse),
        UBUS_METHOD_NOARG("hosts", umdns_hosts),
        UBUS_METHOD_NOARG("reload", umdns_reload),
 };