interface: fix interface memory corruption

[project/mdnsd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index bb639127d9ea4f090d5c03911d3e7e56be0c02c9..9982f86fc1e6121682a71ff959a421a8d27f1559 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -49,11 +49,15 @@ umdns_update(struct ubus_context *ctx, struct ubus_object *obj,
 
 enum {
        BROWSE_SERVICE,
+       BROWSE_ARRAY,
+       BROWSE_ADDRESS,
        BROWSE_MAX
 };
 
 static const struct blobmsg_policy browse_policy[] = {
        [BROWSE_SERVICE]        = { "service", BLOBMSG_TYPE_STRING },
+       [BROWSE_ARRAY]          = { "array", BLOBMSG_TYPE_BOOL },
+       [BROWSE_ADDRESS]        = { "address", BLOBMSG_TYPE_BOOL },
 };
 
 static int
@@ -66,13 +70,20 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
        struct blob_attr *data[BROWSE_MAX];
        void *c1 = NULL, *c2;
        char *service = NULL;
+       int array = 0;
+       bool address = true;
 
        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]);
+       if (data[BROWSE_ADDRESS])
+               address = blobmsg_get_bool(data[BROWSE_ADDRESS]);
 
        blob_buf_init(&b, 0);
        avl_for_each_element(&services, s, avl) {
+               const char *hostname = buffer;
                char *local;
 
                snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->avl.key);
@@ -92,8 +103,10 @@ 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);
+               blobmsg_add_string(&b, "iface", s->iface->name);
+               cache_dump_records(&b, s->entry, array, &hostname);
+               if (address)
+                       cache_dump_records(&b, hostname, array, NULL);
                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,15 +119,29 @@ umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
        return UBUS_STATUS_OK;
 }
 
+enum {
+       HOSTS_ARRAY,
+       __HOSTS_MAX
+};
+static const struct blobmsg_policy hosts_policy[] = {
+       [HOSTS_ARRAY] = { "array", BLOBMSG_TYPE_BOOL }
+};
+
 static int
 umdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
        struct cache_record *prev = NULL;
+       struct blob_attr *tb[__HOSTS_MAX];
        struct cache_record *r;
+       bool array = false;
        void *c;
 
+       blobmsg_parse(hosts_policy, __HOSTS_MAX, tb, blobmsg_data(msg), blobmsg_len(msg));
+       if (tb[HOSTS_ARRAY])
+               array = blobmsg_get_bool(tb[HOSTS_ARRAY]);
+
        blob_buf_init(&b, 0);
        avl_for_each_element(&records, r, avl) {
                if (r->type != TYPE_A && r->type != TYPE_AAAA)
@@ -122,7 +149,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, array, NULL);
                        blobmsg_close_table(&b, c);
                }
                prev = r;
@@ -209,8 +236,8 @@ umdns_query(struct ubus_context *ctx, struct ubus_object *obj,
        if ((c = tb[QUERY_TYPE]))
                type = blobmsg_get_u32(c);
 
-       struct interface *iface_v4 = interface_get(ifname, 0, 1);
-       struct interface *iface_v6 = interface_get(ifname, 1, 1);
+       struct interface *iface_v4 = interface_get(ifname, SOCK_MC_IPV4);
+       struct interface *iface_v6 = interface_get(ifname, SOCK_MC_IPV6);
 
        if (!iface_v4 && !iface_v6)
                return UBUS_STATUS_NOT_FOUND;
@@ -242,7 +269,7 @@ static const struct ubus_method umdns_methods[] = {
        UBUS_METHOD("fetch", umdns_query, query_policy),
        UBUS_METHOD("browse", umdns_browse, browse_policy),
        UBUS_METHOD_NOARG("update", umdns_update),
-       UBUS_METHOD_NOARG("hosts", umdns_hosts),
+       UBUS_METHOD("hosts", umdns_hosts, hosts_policy),
        UBUS_METHOD_NOARG("reload", umdns_reload),
 };