Rename project to umdns

[project/mdnsd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 5381208..9a16a86 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -30,7 +30,7 @@ static struct ubus_auto_conn conn;
 static struct blob_buf b;
 
 static int
-mdns_reload(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_reload(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
@@ -39,7 +39,7 @@ mdns_reload(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
-mdns_scan(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_scan(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
@@ -48,7 +48,7 @@ mdns_scan(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
-mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
@@ -92,7 +92,7 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 static int
-mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
                struct ubus_request_data *req, const char *method,
                struct blob_attr *msg)
 {
@@ -120,29 +120,43 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
        return UBUS_STATUS_OK;
 }
 
+enum {
+       CFG_INTERFACES,
+       CFG_KEEP,
+       CFG_MAX
+};
+
 static const struct blobmsg_policy config_policy[] = {
-       { "interfaces", BLOBMSG_TYPE_ARRAY },
+       [CFG_INTERFACES]        = { "interfaces", BLOBMSG_TYPE_ARRAY },
+       [CFG_KEEP]              = { "keep", BLOBMSG_TYPE_BOOL },
 };
 
 static int
-mdns_set_config(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_set_config(struct ubus_context *ctx, struct ubus_object *obj,
                    struct ubus_request_data *req, const char *method,
                    struct blob_attr *msg)
 {
-       struct blob_attr *data, *cur;
-       int rem;
+       struct blob_attr *data[CFG_MAX], *cur;
+       int rem, keep = false;
 
-       blobmsg_parse(config_policy, 1, &data, blob_data(msg), blob_len(msg));
-       if (!data)
+       blobmsg_parse(config_policy, CFG_MAX, data, blob_data(msg), blob_len(msg));
+       if (!data[CFG_INTERFACES])
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       if (!blobmsg_check_attr_list(data, BLOBMSG_TYPE_STRING))
+       if (!blobmsg_check_attr_list(data[CFG_INTERFACES], BLOBMSG_TYPE_STRING))
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-       vlist_update(&interfaces);
-       blobmsg_for_each_attr(cur, data, rem)
+       keep = data[CFG_KEEP] && blobmsg_get_bool(data[CFG_KEEP]);
+       if (!keep) {
+               vlist_update(&interfaces);
+               ubus_notify(ctx, obj, "set_config", NULL, 1000);
+       }
+
+       blobmsg_for_each_attr(cur, data[CFG_INTERFACES], rem)
                interface_add(blobmsg_data(cur));
-       vlist_flush(&interfaces);
+
+       if (!keep)
+               vlist_flush(&interfaces);
 
        return 0;
 }
@@ -161,7 +175,7 @@ static const struct blobmsg_policy query_policy[QUERY_MAX] = {
 };
 
 static int
-mdns_query(struct ubus_context *ctx, struct ubus_object *obj,
+umdns_query(struct ubus_context *ctx, struct ubus_object *obj,
                    struct ubus_request_data *req, const char *method,
                    struct blob_attr *msg)
 {
@@ -191,10 +205,10 @@ mdns_query(struct ubus_context *ctx, struct ubus_object *obj,
 
        if (!strcmp(method, "query")) {
                if (iface_v4)
-                       dns_send_question(iface_v4, question, type, 0);
+                       dns_send_question(iface_v4, question, type, 1);
 
                if (iface_v6)
-                       dns_send_question(iface_v6, question, type, 0);
+                       dns_send_question(iface_v6, question, type, 1);
 
                return UBUS_STATUS_OK;
        } else if (!strcmp(method, "fetch")) {
@@ -210,24 +224,24 @@ mdns_query(struct ubus_context *ctx, struct ubus_object *obj,
 }
 
 
-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),
-       UBUS_METHOD_NOARG("reload", mdns_reload),
+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_NOARG("scan", umdns_scan),
+       UBUS_METHOD_NOARG("browse", umdns_browse),
+       UBUS_METHOD_NOARG("hosts", umdns_hosts),
+       UBUS_METHOD_NOARG("reload", umdns_reload),
 };
 
-static struct ubus_object_type mdns_object_type =
-       UBUS_OBJECT_TYPE("mdns", mdns_methods);
+static struct ubus_object_type umdns_object_type =
+       UBUS_OBJECT_TYPE("umdns", umdns_methods);
 
-static struct ubus_object mdns_object = {
-       .name = "mdns",
-       .type = &mdns_object_type,
-       .methods = mdns_methods,
-       .n_methods = ARRAY_SIZE(mdns_methods),
+static struct ubus_object umdns_object = {
+       .name = "umdns",
+       .type = &umdns_object_type,
+       .methods = umdns_methods,
+       .n_methods = ARRAY_SIZE(umdns_methods),
 };
 
 static void
@@ -235,7 +249,7 @@ ubus_connect_handler(struct ubus_context *ctx)
 {
        int ret;
 
-       ret = ubus_add_object(ctx, &mdns_object);
+       ret = ubus_add_object(ctx, &umdns_object);
        if (ret)
                fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
 }