return 0;
}
+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
umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
{
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;
+ 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;
- if (*((char *) s->avl.key) != '_')
- continue;
+
snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->avl.key);
local = strstr(buffer, ".local");
if (local)
*local = '\0';
if (!strcmp(buffer, "_tcp") || !strcmp(buffer, "_udp"))
continue;
-
+ if (service && strcmp(buffer, service))
+ continue;
if (!c1) {
c1 = blobmsg_open_table(&b, buffer);
}
- snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);
+ snprintf(buffer, MAX_NAME_LEN, "%s", s->entry);
local = strstr(buffer, "._");
if (local)
*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)) {
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_service *s;
- char *buffer = (char *) mdns_buf;
+ 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(&services, s, avl) {
- char *local;
- if (*((char *) s->avl.key) == '_')
+ avl_for_each_element(&records, r, avl) {
+ if (r->type != TYPE_A && r->type != TYPE_AAAA)
continue;
- snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);
- local = strstr(buffer, "._");
- if (local)
- *local = '\0';
- c = blobmsg_open_table(&b, buffer);
- strncat(buffer, ".local", MAX_NAME_LEN);
- cache_dump_records(&b, buffer);
- cache_dump_records(&b, s->entry);
- blobmsg_close_table(&b, c);
+ /* 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, array, NULL);
+ blobmsg_close_table(&b, c);
+ }
+ prev = r;
}
ubus_send_reply(ctx, req, b.head);
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;
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;
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")) {
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("hosts", umdns_hosts, hosts_policy),
UBUS_METHOD_NOARG("reload", umdns_reload),
};