X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Fservice.c;h=0796adbb717f1ce0285aceb7c4ce5a3c976c5dfc;hp=c2a242bdd8b2590acd5740b3775cd1e05b3b8f1c;hb=f2c77756933f22981c1202c039e7f7e24d7247f3;hpb=02e1a4eac725aaae10c119ec2ec20d0da4a2c958

diff --git a/service/service.c b/service/service.c
index c2a242b..0796adb 100644
--- a/service/service.c
+++ b/service/service.c
@@ -22,7 +22,7 @@
 
 #include "../rcS.h"
 
-struct avl_tree services;
+AVL_TREE(services, avl_strcmp, false, NULL);
 static struct blob_buf b;
 static struct ubus_context *ctx;
 
@@ -213,8 +213,17 @@ static const struct blobmsg_policy validate_policy[__VALIDATE_MAX] = {
 	[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
@@ -424,24 +433,36 @@ service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
 {
 	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)
@@ -531,11 +552,3 @@ void ubus_init_service(struct ubus_context *_ctx)
 	ctx = _ctx;
 	ubus_add_object(ctx, &main_object);
 }
-
-void
-service_init(void)
-{
-	avl_init(&services, avl_strcmp, false, NULL);
-	service_validate_init();
-}
-