X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service.c;h=44b10bef39481ccb5eda59a01086c222f804ea62;hp=1f1b1a88cb433015e823528530c73b5900fb1593;hb=38d78cba6ed4b42b0c1134bf05885d7e09537fde;hpb=2c6b282d4b4a22e511e8cced48263fd0bc9cc6da

diff --git a/service.c b/service.c
index 1f1b1a8..44b10be 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;
@@ -19,8 +18,8 @@ service_instance_add(struct service *s, struct blob_attr *attr)
 	if (!in)
 		return;
 
-	instance_init(in, attr);
-	vlist_add(&s->instances, &in->node, (void *) name);
+	instance_init(in, s, attr);
+	vlist_add(&s->instances, &in->node, (void *) in->name);
 }
 
 static void
@@ -36,12 +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);
 		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);
 		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);
 		instance_start(in_n);
 	}
 }
@@ -50,50 +52,49 @@ static struct service *
 service_alloc(const char *name)
 {
 	struct service *s;
+	char *new_name;
+
+	s = calloc_a(sizeof(*s), &new_name, strlen(name) + 1);
+	strcpy(new_name, name);
 
-	s = calloc(1, sizeof(*s));
 	vlist_init(&s->instances, avl_strcmp, service_instance_update);
 	s->instances.keep_old = true;
+	s->name = new_name;
+	s->avl.key = s->name;
 
 	return s;
 }
 
 enum {
-	SERVICE_ATTR_NAME,
-	SERVICE_ATTR_SCRIPT,
-	SERVICE_ATTR_INSTANCES,
-	__SERVICE_ATTR_MAX
+	SERVICE_SET_NAME,
+	SERVICE_SET_SCRIPT,
+	SERVICE_SET_INSTANCES,
+	__SERVICE_SET_MAX
 };
 
-static const struct blobmsg_policy service_attrs[__SERVICE_ATTR_MAX] = {
-	[SERVICE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
-	[SERVICE_ATTR_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
-	[SERVICE_ATTR_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
+static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = {
+	[SERVICE_SET_NAME] = { "name", BLOBMSG_TYPE_STRING },
+	[SERVICE_SET_SCRIPT] = { "script", BLOBMSG_TYPE_STRING },
+	[SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
 };
 
 
 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 *old_config = s->config;
 	struct blob_attr *cur;
 	int rem;
 
-	/* only the pointer changes, the content stays the same,
-	 * no avl update necessary */
-	s->name = s->avl.key = blobmsg_data(tb[SERVICE_ATTR_NAME]);
-	s->config = config;
-
-	if (tb[SERVICE_ATTR_INSTANCES]) {
-		vlist_update(&s->instances);
-		blobmsg_for_each_attr(cur, tb[SERVICE_ATTR_INSTANCES], rem) {
+	if (tb[SERVICE_SET_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);
 	}
 
-	free(old_config);
-
 	return 0;
 }
 
@@ -106,21 +107,39 @@ service_delete(struct service *s)
 	free(s);
 }
 
+enum {
+	SERVICE_ATTR_NAME,
+	__SERVICE_ATTR_MAX,
+};
+
+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,
 		   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_SET_MAX], *cur;
 	struct service *s = NULL;
 	const char *name;
 	int ret = UBUS_STATUS_INVALID_ARGUMENT;
+	bool add = !strcmp(method, "add");
 
-	msg = blob_memdup(msg);
-	if (!msg)
-		return UBUS_STATUS_UNKNOWN_ERROR;
-
-	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+	blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
 	cur = tb[SERVICE_ATTR_NAME];
 	if (!cur)
 		goto free;
@@ -128,14 +147,17 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
 	name = blobmsg_data(cur);
 
 	s = avl_find_element(&services, name, s, avl);
-	if (s)
-		return service_update(s, msg, tb);
+	if (s) {
+		DPRINTF("Update service %s\n", name);
+		return service_update(s, msg, tb, add);
+	}
 
+	DPRINTF("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;
 
@@ -178,27 +200,18 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
-enum {
-	SERVICE_DEL_NAME,
-	__SERVICE_DEL_MAX,
-};
-
-static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_MAX] = {
-	[SERVICE_DEL_NAME] = { "name", BLOBMSG_TYPE_STRING },
-};
-
-
 static int
 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_DEL_MAX], *cur;
+	struct blob_attr *tb[__SERVICE_DEL_ATTR_MAX], *cur;
 	struct service *s, *tmp;
+	struct service_instance *in;
 
-	blobmsg_parse(service_del_attrs, __SERVICE_DEL_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);
@@ -209,14 +222,56 @@ 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) {
+		fprintf(stderr, "instance %s not found\n", (char *) blobmsg_data(cur));
+		return UBUS_STATUS_NOT_FOUND;
+	}
+
+	vlist_delete(&s->instances, &in->node);
+
+	return 0;
+}
+
+static int
+service_handle_update(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 service *s;
+
+	blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+	cur = tb[SERVICE_ATTR_NAME];
+	if (!cur)
+		return UBUS_STATUS_INVALID_ARGUMENT;
+
+	s = avl_find_element(&services, blobmsg_data(cur), s, avl);
+	if (!s)
+		return UBUS_STATUS_NOT_FOUND;
+
+	if (!strcmp(method, "update_start"))
+		vlist_update(&s->instances);
+	else
+		vlist_flush(&s->instances);
+
 	return 0;
 }
 
 static struct ubus_method main_object_methods[] = {
-	{ .name = "list", .handler = service_handle_list },
-	{ .name = "set", .handler = service_handle_set },
-	{ .name = "delete", .handler = service_handle_delete },
+	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_del_attrs),
+	UBUS_METHOD("update_start", service_handle_update, service_attrs),
+	UBUS_METHOD("update_complete", service_handle_update, service_attrs),
 };
 
 static struct ubus_object_type main_object_type =