+/*
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include <libubox/avl-cmp.h>
#include "procd.h"
#include "service.h"
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;
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
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);
+ DEBUG(1, "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);
+ DEBUG(1, "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);
+ DEBUG(1, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
}
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;
}
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;
}
[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 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);
+ DEBUG(1, "Update service %s\n", name);
+ return service_update(s, msg, tb, add);
}
- DPRINTF("Create service %s\n", name);
+ DEBUG(1, "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;
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);
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;
}
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),
};
.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);
projects / project / procd.git / blobdiff