AVL_TREE(services, avl_strcmp, false, NULL);
static struct blob_buf b;
static struct ubus_context *ctx;
+static struct ubus_object main_object;
static void
service_instance_add(struct service *s, struct blob_attr *attr)
instance_update(in_o, in_n);
instance_free(in_n);
} else if (in_o) {
- DEBUG(2, "Free instance %s::%s\n", in_o->srv->name, in_o->name);
- instance_stop(in_o);
- instance_free(in_o);
- } else if (in_n) {
- DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
+ DEBUG(2, "Stop instance %s::%s\n", in_o->srv->name, in_o->name);
+ instance_stop(in_o, true);
+ } else if (in_n && in_n->srv->autostart) {
+ DEBUG(2, "Start instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
blob_buf_init(&b, 0);
strcpy(new_name, name);
vlist_init(&s->instances, avl_strcmp, service_instance_update);
- s->instances.keep_old = true;
+ s->instances.no_delete = true;
s->name = new_name;
s->avl.key = s->name;
INIT_LIST_HEAD(&s->validators);
+ blobmsg_list_simple_init(&s->data_blob);
return s;
}
SERVICE_SET_INSTANCES,
SERVICE_SET_TRIGGER,
SERVICE_SET_VALIDATE,
+ SERVICE_SET_AUTOSTART,
+ SERVICE_SET_DATA,
__SERVICE_SET_MAX
};
[SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE },
[SERVICE_SET_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
[SERVICE_SET_VALIDATE] = { "validate", BLOBMSG_TYPE_ARRAY },
+ [SERVICE_SET_AUTOSTART] = { "autostart", BLOBMSG_TYPE_BOOL },
+ [SERVICE_SET_DATA] = { "data", BLOBMSG_TYPE_TABLE },
};
static int
s->trigger = NULL;
}
+ if (s->data) {
+ blobmsg_list_free(&s->data_blob);
+ free(s->data);
+ s->data = NULL;
+ }
+
service_validate_del(s);
+ if (tb[SERVICE_SET_AUTOSTART] && !blobmsg_get_bool(tb[SERVICE_SET_AUTOSTART]))
+ s->autostart = false;
+ else
+ s->autostart = true;
+
if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
s->trigger = blob_memdup(tb[SERVICE_SET_TRIGGER]);
if (!s->trigger)
vlist_flush(&s->instances);
}
+ if (tb[SERVICE_SET_DATA] && blobmsg_data_len(tb[SERVICE_SET_DATA])) {
+ s->data = blob_memdup(tb[SERVICE_SET_DATA]);
+ if (!s->data)
+ return -1;
+ blobmsg_list_fill(&s->data_blob, blobmsg_data(s->data),
+ blobmsg_data_len(s->data), false);
+ }
+
+ s->deleted = false;
+
rc(s->name, "running");
return 0;
static void
service_delete(struct service *s)
{
- service_event("service.stop", s->name, NULL);
+ blobmsg_list_free(&s->data_blob);
+ free(s->data);
vlist_flush_all(&s->instances);
- avl_delete(&services, &s->avl);
- trigger_del(s);
- free(s->trigger);
- free(s);
- service_validate_del(s);
+ s->deleted = true;
+ service_stopped(s);
}
enum {
};
enum {
+ SERVICE_STATE_ATTR_SPAWN,
+ SERVICE_STATE_ATTR_NAME,
+ __SERVICE_STATE_ATTR_MAX,
+};
+
+static const struct blobmsg_policy service_state_attrs[__SERVICE_STATE_ATTR_MAX] = {
+ [SERVICE_STATE_ATTR_SPAWN] = { "spawn", BLOBMSG_TYPE_BOOL },
+ [SERVICE_STATE_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+};
+
+enum {
EVENT_TYPE,
EVENT_DATA,
__EVENT_MAX
bool add = !strcmp(method, "add");
int ret;
- blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
- cur = tb[SERVICE_ATTR_NAME];
+ blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
+ cur = tb[SERVICE_SET_NAME];
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
c = blobmsg_open_table(&b, s->name);
+ if (!s->autostart)
+ blobmsg_add_u8(&b, "autostart", false);
+
+ if (!avl_is_empty(&s->data_blob.avl)) {
+ struct blobmsg_list_node *var;
+ i = blobmsg_open_table(&b, "data");
+ blobmsg_list_for_each(&s->data_blob, var)
+ blobmsg_add_blob(&b, var->data);
+ blobmsg_close_table(&b, i);
+ }
+
if (!avl_is_empty(&s->instances.avl)) {
i = blobmsg_open_table(&b, "instances");
vlist_for_each_element(&s->instances, in, node)
const char *name = NULL;
bool verbose = false;
- blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[SERVICE_LIST_ATTR_VERBOSE])
verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
struct service *s;
struct service_instance *in;
- blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
cur = tb[SERVICE_DEL_ATTR_NAME];
if (!cur)
int sig = SIGHUP;
int rv = 0;
- blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(service_signal_attrs, __SERVICE_SIGNAL_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
cur = tb[SERVICE_SIGNAL_ATTR_SIGNAL];
if (cur)
}
static int
+service_handle_state(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_STATE_ATTR_MAX];
+ struct service *s;
+ struct service_instance *in;
+ int spawn;
+
+ blobmsg_parse(service_state_attrs, __SERVICE_STATE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
+
+ if (!tb[SERVICE_STATE_ATTR_SPAWN])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if (!tb[SERVICE_STATE_ATTR_NAME])
+ return UBUS_STATUS_NOT_FOUND;
+
+ s = avl_find_element(&services, blobmsg_data(tb[SERVICE_STATE_ATTR_NAME]), s, avl);
+ if (!s)
+ return UBUS_STATUS_NOT_FOUND;
+
+ spawn = !!blobmsg_get_u8(tb[SERVICE_STATE_ATTR_SPAWN]);
+ vlist_for_each_element(&s->instances, in, node) {
+ if (!!in->proc.pending == !!spawn)
+ continue;
+ else if (!in->proc.pending)
+ instance_start(in);
+ else
+ instance_stop(in, false);
+ }
+
+ return UBUS_STATUS_OK;
+}
+
+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));
+ blobmsg_parse(service_attrs, __SERVICE_ATTR_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
cur = tb[SERVICE_SET_NAME];
if (!cur)
return 0;
}
+static void ubus_event_bcast(const char *type, const char *param1, const char *val1,
+ const char *param2, const char *val2)
+{
+ if (!ctx)
+ return;
+
+ blob_buf_init(&b, 0);
+ if (param1 && val1)
+ blobmsg_add_string(&b, param1, val1);
+ if (param2 && val2)
+ blobmsg_add_string(&b, param2, val2);
+ ubus_notify(ctx, &main_object, type, b.head, -1);
+}
+
static int
service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
struct blob_attr *tb[__EVENT_MAX];
+ const char *event;
if (!msg)
return UBUS_STATUS_INVALID_ARGUMENT;
- blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(event_policy, __EVENT_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (!tb[EVENT_TYPE] || !tb[EVENT_DATA])
return UBUS_STATUS_INVALID_ARGUMENT;
- trigger_event(blobmsg_get_string(tb[EVENT_TYPE]), tb[EVENT_DATA]);
+ event = blobmsg_get_string(tb[EVENT_TYPE]);
+ trigger_event(event, tb[EVENT_DATA]);
+
+ if (!strcmp(event, "config.change")) {
+ struct blob_attr *tb2[__VALIDATE_MAX];
+ blobmsg_parse(validate_policy, __VALIDATE_MAX, tb2,
+ blobmsg_data(tb[EVENT_DATA]), blobmsg_data_len(tb[EVENT_DATA]));
+ if (tb2[VALIDATE_PACKAGE])
+ ubus_event_bcast("config.change", "config",
+ blobmsg_get_string(tb2[VALIDATE_PACKAGE]), NULL, NULL);
+ }
return 0;
}
if (!msg)
return UBUS_STATUS_INVALID_ARGUMENT;
- blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(validate_policy, __VALIDATE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[VALIDATE_SERVICE]) {
return 0;
}
const char *instance = NULL;
const char *type = NULL;
- blobmsg_parse(get_data_policy, __DATA_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(get_data_policy, __DATA_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
if (tb[DATA_NAME])
name = blobmsg_data(tb[DATA_NAME]);
if (tb[DATA_INSTANCE])
blob_buf_init(&b, 0);
avl_for_each_element(&services, s, avl) {
void *cs = NULL;
+ void *ci = NULL;
+ struct blobmsg_list_node *var;
if (name && strcmp(name, s->name))
continue;
+ blobmsg_list_for_each(&s->data_blob, var) {
+ if (type && strcmp(blobmsg_name(var->data), type))
+ continue;
+
+ if (!cs)
+ cs = blobmsg_open_table(&b, s->name);
+
+ blobmsg_add_blob(&b, var->data);
+ }
+
vlist_for_each_element(&s->instances, in, node) {
- struct blobmsg_list_node *var;
- void *ci = NULL;
+ ci = NULL;
if (instance && strcmp(instance, in->name))
continue;
UBUS_METHOD("event", service_handle_event, event_policy),
UBUS_METHOD("validate", service_handle_validate, validate_policy),
UBUS_METHOD("get_data", service_get_data, get_data_policy),
+ UBUS_METHOD("state", service_handle_state, service_state_attrs),
};
static struct ubus_object_type main_object_type =
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
-void service_event(const char *type, const char *service, const char *instance)
+void service_stopped(struct service *s)
{
- if (!ctx)
- return;
+ if (s->deleted && avl_is_empty(&s->instances.avl)) {
+ service_event("service.stop", s->name, NULL);
+ avl_delete(&services, &s->avl);
+ trigger_del(s);
+ service_validate_del(s);
+ free(s->trigger);
+ free(s);
+ }
+}
- blob_buf_init(&b, 0);
- blobmsg_add_string(&b, "service", service);
- if (instance)
- blobmsg_add_string(&b, "instance", instance);
- ubus_notify(ctx, &main_object, type, b.head, -1);
+void service_event(const char *type, const char *service, const char *instance)
+{
+ ubus_event_bcast(type, "service", service, "instance", instance);
}
void ubus_init_service(struct ubus_context *_ctx)