X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service.c;h=e51e399f5ee7ee333364f2f953ccff6a963ff835;hp=da7ec9b1d4c1ae06fa6929a2be7a791a0ba5359f;hb=6390afe7a3cf1663979078711febb2be21fb4cf2;hpb=3688e3a3c27e71e4e20c47dc749a3fcb1fc9be20

diff --git a/service.c b/service.c
index da7ec9b..e51e399 100644
--- a/service.c
+++ b/service.c
@@ -10,7 +10,6 @@ static void
 service_instance_add(struct service *s, struct blob_attr *attr)
 {
 	struct service_instance *in;
-	const char *name = blobmsg_name(attr);
 
 	if (blobmsg_type(attr) != BLOBMSG_TYPE_TABLE)
 		return;
@@ -20,7 +19,7 @@ service_instance_add(struct service *s, struct blob_attr *attr)
 		return;
 
 	instance_init(in, s, attr);
-	vlist_add(&s->instances, &in->node, (void *) name);
+	vlist_add(&s->instances, &in->node, (void *) in->name);
 }
 
 static void
@@ -36,15 +35,15 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
 		in_n = container_of(node_new, struct service_instance, node);
 
 	if (in_o && in_n) {
-		DPRINTF("Update instance %s::%s\n", in_o->srv->name, in_o->name);
+		LOG("Update instance %s::%s\n", in_o->srv->name, in_o->name);
 		instance_update(in_o, in_n);
 		instance_free(in_n);
 	} else if (in_o) {
-		DPRINTF("Free instance %s::%s\n", in_o->srv->name, in_o->name);
+		LOG("Free instance %s::%s\n", in_o->srv->name, in_o->name);
 		instance_stop(in_o, false);
 		instance_free(in_o);
 	} else if (in_n) {
-		DPRINTF("Create instance %s::%s\n", in_n->srv->name, in_n->name);
+		LOG("Create instance %s::%s\n", in_n->srv->name, in_n->name);
 		instance_start(in_n);
 	}
 }
@@ -55,9 +54,7 @@ service_alloc(const char *name)
 	struct service *s;
 	char *new_name;
 
-	s = calloc(1, sizeof(*s) + strlen(name) + 1);
-
-	new_name = (char *) s + 1;
+	s = calloc_a(sizeof(*s), &new_name, strlen(name) + 1);
 	strcpy(new_name, name);
 
 	vlist_init(&s->instances, avl_strcmp, service_instance_update);
@@ -83,17 +80,19 @@ static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
 
 
 static int
-service_update(struct service *s, struct blob_attr *config, struct blob_attr **tb)
+service_update(struct service *s, struct blob_attr *config, struct blob_attr **tb, bool add)
 {
 	struct blob_attr *cur;
 	int rem;
 
 	if (tb[SERVICE_SET_INSTANCES]) {
-		vlist_update(&s->instances);
+		if (!add)
+			vlist_update(&s->instances);
 		blobmsg_for_each_attr(cur, tb[SERVICE_SET_INSTANCES], rem) {
 			service_instance_add(s, cur);
 		}
-		vlist_flush(&s->instances);
+		if (!add)
+			vlist_flush(&s->instances);
 	}
 
 	return 0;
@@ -117,6 +116,17 @@ static const struct blobmsg_policy service_attrs[__SERVICE_ATTR_MAX] = {
 	[SERVICE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
 };
 
+enum {
+	SERVICE_DEL_ATTR_NAME,
+	SERVICE_DEL_ATTR_INSTANCE,
+	__SERVICE_DEL_ATTR_MAX,
+};
+
+static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_ATTR_MAX] = {
+	[SERVICE_DEL_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+	[SERVICE_DEL_ATTR_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING },
+};
+
 
 static int
 service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
@@ -127,6 +137,7 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
 	struct service *s = NULL;
 	const char *name;
 	int ret = UBUS_STATUS_INVALID_ARGUMENT;
+	bool add = !strcmp(method, "add");
 
 	blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
 	cur = tb[SERVICE_ATTR_NAME];
@@ -137,16 +148,16 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
 
 	s = avl_find_element(&services, name, s, avl);
 	if (s) {
-		DPRINTF("Update service %s\n", name);
-		return service_update(s, msg, tb);
+		LOG("Update service %s\n", name);
+		return service_update(s, msg, tb, add);
 	}
 
-	DPRINTF("Create service %s\n", name);
+	LOG("Create service %s\n", name);
 	s = service_alloc(name);
 	if (!s)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	ret = service_update(s, msg, tb);
+	ret = service_update(s, msg, tb, add);
 	if (ret)
 		goto free;
 
@@ -194,12 +205,13 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
 		    struct ubus_request_data *req, const char *method,
 		    struct blob_attr *msg)
 {
-	struct blob_attr *tb[__SERVICE_ATTR_MAX], *cur;
+	struct blob_attr *tb[__SERVICE_DEL_ATTR_MAX], *cur;
 	struct service *s, *tmp;
+	struct service_instance *in;
 
-	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
-	cur = tb[SERVICE_ATTR_NAME];
+	cur = tb[SERVICE_DEL_ATTR_NAME];
 	if (!cur) {
 		avl_for_each_element_safe(&services, s, avl, tmp)
 			service_delete(s);
@@ -210,7 +222,20 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!s)
 		return UBUS_STATUS_NOT_FOUND;
 
-	service_delete(s);
+	cur = tb[SERVICE_DEL_ATTR_INSTANCE];
+	if (!cur) {
+		service_delete(s);
+		return 0;
+	}
+
+	in = vlist_find(&s->instances, blobmsg_data(cur), in, node);
+	if (!in) {
+		ERROR("instance %s not found\n", (char *) blobmsg_data(cur));
+		return UBUS_STATUS_NOT_FOUND;
+	}
+
+	vlist_delete(&s->instances, &in->node);
+
 	return 0;
 }
 
@@ -242,8 +267,9 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj,
 
 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("delete", service_handle_delete, service_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),
 };
@@ -258,7 +284,7 @@ static struct ubus_object main_object = {
 	.n_methods = ARRAY_SIZE(main_object_methods),
 };
 
-void procd_init_service(struct ubus_context *ctx)
+void ubus_init_service(struct ubus_context *ctx)
 {
 	avl_init(&services, avl_strcmp, false, NULL);
 	ubus_add_object(ctx, &main_object);