X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Fservice.c;h=c2a242bdd8b2590acd5740b3775cd1e05b3b8f1c;hp=bfc8d492edb9a539b6b918510e15fe11e489603d;hb=4bccbfa967d756b8c84a62ea4752e936d8545a73;hpb=0a80e92c03a90d5f6593b6af171bbed5480e0f55 diff --git a/service/service.c b/service/service.c index bfc8d49..c2a242b 100644 --- a/service/service.c +++ b/service/service.c @@ -24,6 +24,7 @@ struct avl_tree services; static struct blob_buf b; +static struct ubus_context *ctx; static void service_instance_add(struct service *s, struct blob_attr *attr) @@ -65,6 +66,8 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new, DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name); instance_start(in_n); } + blob_buf_init(&b, 0); + trigger_event("instance.update", b.head); } static struct service * @@ -103,7 +106,7 @@ 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, bool add) +service_update(struct service *s, struct blob_attr **tb, bool add) { struct blob_attr *cur; int rem; @@ -146,10 +149,10 @@ service_update(struct service *s, struct blob_attr *config, struct blob_attr **t static void service_delete(struct service *s) { + service_event("service.stop", s->name, NULL); vlist_flush_all(&s->instances); avl_delete(&services, &s->avl); trigger_del(s); - s->trigger = NULL; free(s->trigger); free(s); service_validate_del(s); @@ -176,11 +179,13 @@ static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_ATTR_MAX] = { }; enum { + SERVICE_LIST_ATTR_NAME, SERVICE_LIST_ATTR_VERBOSE, __SERVICE_LIST_ATTR_MAX, }; static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = { + [SERVICE_LIST_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING }, [SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL }, }; @@ -208,6 +213,10 @@ static const struct blobmsg_policy validate_policy[__VALIDATE_MAX] = { [VALIDATE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING }, }; +static const struct blobmsg_policy get_data_policy[] = { + { "type", BLOBMSG_TYPE_STRING } +}; + static int service_handle_set(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, @@ -229,7 +238,7 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj, s = avl_find_element(&services, name, s, avl); if (s) { DEBUG(2, "Update service %s\n", name); - return service_update(s, msg, tb, add); + return service_update(s, tb, add); } DEBUG(2, "Create service %s\n", name); @@ -237,17 +246,19 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj, if (!s) return UBUS_STATUS_UNKNOWN_ERROR; - ret = service_update(s, msg, tb, add); + ret = service_update(s, tb, add); if (ret) return ret; avl_insert(&services, &s->avl); + service_event("service.start", s->name, NULL); + return 0; } static void -service_dump(struct service *s, int verbose) +service_dump(struct service *s, bool verbose) { struct service_instance *in; void *c, *i; @@ -274,16 +285,23 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj, { struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX]; struct service *s; - int verbose = 0; + const char *name = NULL; + bool verbose = false; blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); - if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE])) - verbose = 1; + if (tb[SERVICE_LIST_ATTR_VERBOSE]) + verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]); + if (tb[SERVICE_LIST_ATTR_NAME]) + name = blobmsg_get_string(tb[SERVICE_LIST_ATTR_NAME]); blob_buf_init(&b, 0); - avl_for_each_element(&services, s, avl) + avl_for_each_element(&services, s, avl) { + if (name && strcmp(s->name, name) != 0) + continue; + service_dump(s, verbose); + } ubus_send_reply(ctx, req, b.head); @@ -399,15 +417,63 @@ service_handle_validate(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +static int +service_get_data(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct service_instance *in; + struct service *s; + struct blob_attr *tb; + const char *type = NULL; + + blobmsg_parse(get_data_policy, 1, &tb, blob_data(msg), blob_len(msg)); + if (tb) + type = blobmsg_data(tb); + + blob_buf_init(&b, 0); + avl_for_each_element(&services, s, avl) { + void *cs = NULL; + + vlist_for_each_element(&s->instances, in, node) { + struct blobmsg_list_node *var; + void *ci = NULL; + + blobmsg_list_for_each(&in->data, var) { + if (type && + strcmp(blobmsg_name(var->data), type) != 0) + continue; + + if (!cs) + cs = blobmsg_open_table(&b, s->name); + if (!ci) + ci = blobmsg_open_table(&b, in->name); + + blobmsg_add_blob(&b, var->data); + } + + if (ci) + blobmsg_close_table(&b, ci); + } + + if (cs) + blobmsg_close_table(&b, cs); + } + + ubus_send_reply(ctx, req, b.head); + 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("list", service_handle_list, service_list_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), 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), }; static struct ubus_object_type main_object_type = @@ -448,8 +514,21 @@ service_start_early(char *name, char *cmdline) return service_handle_set(NULL, NULL, NULL, "add", b.head); } -void ubus_init_service(struct ubus_context *ctx) +void service_event(const char *type, const char *service, const char *instance) +{ + if (!ctx) + return; + + 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 ubus_init_service(struct ubus_context *_ctx) { + ctx = _ctx; ubus_add_object(ctx, &main_object); }