#include "../rcS.h"
-struct avl_tree services;
+AVL_TREE(services, avl_strcmp, false, NULL);
static struct blob_buf b;
static struct ubus_context *ctx;
};
enum {
+ SERVICE_LIST_ATTR_NAME,
SERVICE_LIST_ATTR_VERBOSE,
__SERVICE_LIST_ATTR_MAX,
};
static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = {
+ [SERVICE_LIST_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL },
};
[VALIDATE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
};
+enum {
+ DATA_NAME,
+ DATA_INSTANCE,
+ DATA_TYPE,
+ __DATA_MAX
+};
+
static const struct blobmsg_policy get_data_policy[] = {
- { "type", BLOBMSG_TYPE_STRING }
+ [DATA_NAME] = { "name", BLOBMSG_TYPE_STRING },
+ [DATA_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
+ [DATA_TYPE] = { "type", BLOBMSG_TYPE_STRING },
};
static int
}
static void
-service_dump(struct service *s, int verbose)
+service_dump(struct service *s, bool verbose)
{
struct service_instance *in;
void *c, *i;
{
struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX];
struct service *s;
- int verbose = 0;
+ const char *name = NULL;
+ bool verbose = false;
blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
- if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]))
- verbose = 1;
+ if (tb[SERVICE_LIST_ATTR_VERBOSE])
+ verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
+ if (tb[SERVICE_LIST_ATTR_NAME])
+ name = blobmsg_get_string(tb[SERVICE_LIST_ATTR_NAME]);
blob_buf_init(&b, 0);
- avl_for_each_element(&services, s, avl)
+ avl_for_each_element(&services, s, avl) {
+ if (name && strcmp(s->name, name) != 0)
+ continue;
+
service_dump(s, verbose);
+ }
ubus_send_reply(ctx, req, b.head);
{
struct service_instance *in;
struct service *s;
- struct blob_attr *tb;
+ struct blob_attr *tb[__DATA_MAX];
+ const char *name = NULL;
+ const char *instance = NULL;
const char *type = NULL;
- blobmsg_parse(get_data_policy, 1, &tb, blob_data(msg), blob_len(msg));
- if (tb)
- type = blobmsg_data(tb);
+ blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+ if (tb[DATA_NAME])
+ name = blobmsg_data(tb[DATA_NAME]);
+ if (tb[DATA_INSTANCE])
+ instance = blobmsg_data(tb[DATA_INSTANCE]);
+ if (tb[DATA_TYPE])
+ type = blobmsg_data(tb[DATA_TYPE]);
blob_buf_init(&b, 0);
avl_for_each_element(&services, s, avl) {
void *cs = NULL;
+ if (name && strcmp(name, s->name))
+ continue;
+
vlist_for_each_element(&s->instances, in, node) {
struct blobmsg_list_node *var;
void *ci = NULL;
+ if (instance && strcmp(instance, in->name))
+ continue;
+
blobmsg_list_for_each(&in->data, var) {
if (type &&
- strcmp(blobmsg_name(var->data), type) != 0)
+ strcmp(blobmsg_name(var->data), type))
continue;
if (!cs)
static struct ubus_method main_object_methods[] = {
UBUS_METHOD("set", service_handle_set, service_set_attrs),
UBUS_METHOD("add", service_handle_set, service_set_attrs),
- UBUS_METHOD("list", service_handle_list, service_attrs),
+ UBUS_METHOD("list", service_handle_list, service_list_attrs),
UBUS_METHOD("delete", service_handle_delete, service_del_attrs),
UBUS_METHOD("update_start", service_handle_update, service_attrs),
UBUS_METHOD("update_complete", service_handle_update, service_attrs),
ctx = _ctx;
ubus_add_object(ctx, &main_object);
}
-
-void
-service_init(void)
-{
- avl_init(&services, avl_strcmp, false, NULL);
- service_validate_init();
-}
-