X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service.c;h=27ed8c0a5ca3cad7485c8e807569f3eb39544bd8;hp=56e0febad0320d1dbe32d647acfb1dbbc53d317b;hb=0a7d365974184880ff573d7272f04777889deaaa;hpb=4fc011106560cd826a3bec0c63ba3a0cc01e67c6

diff --git a/service.c b/service.c
index 56e0feb..27ed8c0 100644
--- a/service.c
+++ b/service.c
@@ -53,10 +53,17 @@ static struct service *
 service_alloc(const char *name)
 {
 	struct service *s;
+	char *new_name;
+
+	s = calloc(1, sizeof(*s) + strlen(name) + 1);
+
+	new_name = (char *) (s + 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;
 }
@@ -76,27 +83,21 @@ 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 *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_SET_NAME]);
-	s->config = config;
-
 	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);
 	}
 
-	free(old_config);
-
 	return 0;
 }
 
@@ -128,10 +129,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;
-
-	msg = blob_memdup(msg);
-	if (!msg)
-		return UBUS_STATUS_UNKNOWN_ERROR;
+	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];
@@ -143,7 +141,7 @@ 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);
+		return service_update(s, msg, tb, add);
 	}
 
 	DPRINTF("Create service %s\n", name);
@@ -151,7 +149,7 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
 	if (!s)
 		return UBUS_STATUS_UNKNOWN_ERROR;
 
-	ret = service_update(s, msg, tb);
+	ret = service_update(s, msg, tb, add);
 	if (ret)
 		goto free;
 
@@ -247,6 +245,7 @@ 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("update_start", service_handle_update, service_attrs),