Add query ubus call

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

diff --git a/interface.c b/interface.c
index 70c02aa706351d19c096bf0429b09f174104103f..c8d89721d05f15f6e248732f8b694be700f2f45f 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -627,4 +627,13 @@ void interface_shutdown(void)
                interface_close(iface);
 }
 
+struct interface*
+interface_get(const char *name, int v6, int multicast)
+{
+       char id_buf[32];
+       snprintf(id_buf, sizeof(id_buf), "%d_%d_%s", multicast, v6, name);
+       struct interface *iface = vlist_find(&interfaces, id_buf, iface, node);
+       return iface;
+}
+
 VLIST_TREE(interfaces, avl_strcmp, iface_update_cb, false, false);

diff --git a/interface.h b/interface.h
index 4bd8e0c1c87b27b18fea95fa598cbf0c35fa7d91..50d70715a98161e134b00371520368aa8015f3f2 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -54,5 +54,6 @@ struct interface {
 int interface_add(const char *name);
 void interface_shutdown(void);
 int interface_send_packet(struct interface *iface, struct iovec *iov, int iov_len);
+struct interface* interface_get(const char *name, int v6, int multicast);
 
 #endif

diff --git a/ubus.c b/ubus.c
index 67c3af73cc1a8c276ad12af94ae96aa29c827860..ebd31573d307e61ae7ad5afd0df7832dd3c1904e 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -147,9 +147,61 @@ mdns_set_config(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+enum query_attr {
+       QUERY_QUESTION,
+       QUERY_IFACE,
+       QUERY_TYPE,
+       QUERY_MAX
+};
+
+static const struct blobmsg_policy query_policy[QUERY_MAX] = {
+       [QUERY_QUESTION]= { "question", BLOBMSG_TYPE_STRING },
+       [QUERY_IFACE]   = { "interface", BLOBMSG_TYPE_STRING },
+       [QUERY_TYPE]    = { "type", BLOBMSG_TYPE_INT32 },
+};
+
+static int
+mdns_query(struct ubus_context *ctx, struct ubus_object *obj,
+                   struct ubus_request_data *req, const char *method,
+                   struct blob_attr *msg)
+{
+       struct blob_attr *tb[QUERY_MAX], *c;
+       const char *question = "_services._dns-sd._udp.local";
+       const char *ifname;
+       int type = TYPE_ANY;
+
+       blobmsg_parse(query_policy, QUERY_MAX, tb, blob_data(msg), blob_len(msg));
+
+       if (!(c = tb[QUERY_IFACE]))
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       ifname = blobmsg_get_string(c);
+
+       if ((c = tb[QUERY_QUESTION]))
+               question = blobmsg_get_string(c);
+
+       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);
+
+       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;
+}
+
 
 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_NOARG("scan", mdns_scan),
        UBUS_METHOD_NOARG("browse", mdns_browse),
        UBUS_METHOD_NOARG("hosts", mdns_hosts),