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;
}
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;
}
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];
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);
if (!s)
return UBUS_STATUS_UNKNOWN_ERROR;
- ret = service_update(s, msg, tb);
+ ret = service_update(s, msg, tb, add);
if (ret)
goto free;
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),