X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=7bb2c328a703666099bd9006ddd9998f3ea37e32;hb=d597a7dd81bbb83a0442345c547b3317839994cf;hp=63ea3f8ad86c39720e65d7444f27f68d82dde48a;hpb=0b838a6101edc810098ee0645d3bfd966096ae07;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 63ea3f8a..7bb2c328 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -22,15 +22,19 @@ #include #include +#include + #include -#include "afb-apis.h" +#include "afb-api.h" +#include "afb-apiset.h" #include "afb-svc.h" #include "afb-evt.h" #include "afb-common.h" #include "afb-context.h" #include "afb-api-so.h" #include "afb-xreq.h" +#include "afb-ditf.h" #include "verbose.h" /* @@ -45,87 +49,11 @@ static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent"; */ struct api_so_v1 { struct afb_binding *binding; /* descriptor */ - size_t apilength; /* length of the API name */ void *handle; /* context of dlopen */ struct afb_svc *service; /* handler for service started */ - struct afb_binding_interface interface; /* interface for the binding */ -}; - -static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name); -static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object); -static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args); -static int afb_api_so_rootdir_get_fd(void *closure); -static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale); - -static const struct afb_daemon_itf daemon_itf = { - .event_broadcast = afb_api_so_event_broadcast_cb, - .get_event_loop = afb_common_get_event_loop, - .get_user_bus = afb_common_get_user_bus, - .get_system_bus = afb_common_get_system_bus, - .vverbose = afb_api_so_vverbose_cb, - .event_make = afb_api_so_event_make_cb, - .rootdir_get_fd = afb_api_so_rootdir_get_fd, - .rootdir_open_locale = afb_api_so_rootdir_open_locale + struct afb_ditf ditf; /* daemon interface */ }; -static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name) -{ - size_t length; - char *event; - struct api_so_v1 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->v1.prefix, desc->apilength); - event[desc->apilength] = '/'; - memcpy(event + desc->apilength + 1, name, length + 1); - - /* crate the event */ - return afb_evt_create_event(event); -} - -static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object) -{ - size_t length; - char *event; - struct api_so_v1 *desc = closure; - - /* makes the event name */ - assert(desc->binding != NULL); - length = strlen(name); - event = alloca(length + 2 + desc->apilength); - memcpy(event, desc->binding->v1.prefix, desc->apilength); - event[desc->apilength] = '/'; - memcpy(event + desc->apilength + 1, name, length + 1); - - return afb_evt_broadcast(event, object); -} - -static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args) -{ - char *p; - struct api_so_v1 *desc = closure; - - if (vasprintf(&p, fmt, args) < 0) - vverbose(level, file, line, fmt, args); - else { - verbose(level, file, line, "%s {binding %s}", p, desc->binding->v1.prefix); - free(p); - } -} - -static int afb_api_so_rootdir_get_fd(void *closure) -{ - return afb_common_rootdir_get_fd(); -} - -static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale) -{ - return afb_common_rootdir_open_locale(filename, flags, locale); -} - static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name) { const struct afb_verb_desc_v1 *verb; @@ -143,17 +71,13 @@ static void call_cb(void *closure, struct afb_xreq *xreq) verb = search(desc, xreq->verb); if (!verb) - afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->v1.prefix); - else { - xreq->timeout = afb_api_so_timeout; - xreq->sessionflags = (int)verb->session; - xreq->group = desc; - xreq->callback = verb->callback; - afb_xreq_call(xreq); - } + afb_xreq_fail_unknown_verb(xreq); + else + if (!xreq_session_check_apply(xreq, verb->session)) + afb_xreq_call(xreq, verb->callback); } -static int service_start_cb(void *closure, int share_session, int onneed) +static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) { int (*init)(struct afb_service service); void (*onevent)(const char *event, struct json_object *object); @@ -185,7 +109,7 @@ static int service_start_cb(void *closure, int share_session, int onneed) /* get the event handler if any */ onevent = dlsym(desc->handle, afb_api_so_v1_service_event); - desc->service = afb_svc_create(share_session, init, onevent); + desc->service = afb_svc_create(apiset, share_session, init, onevent); if (desc->service == NULL) { /* starting error */ ERROR("Starting service %s failed", desc->binding->v1.prefix); @@ -195,12 +119,81 @@ static int service_start_cb(void *closure, int share_session, int onneed) return 0; } -int afb_api_so_v1_add(const char *path, void *handle) +static void update_hooks_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + afb_ditf_update_hook(&desc->ditf); +} + +static int get_verbosity_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + return desc->ditf.interface.verbosity; +} + +static void set_verbosity_cb(void *closure, int level) +{ + struct api_so_v1 *desc = closure; + desc->ditf.interface.verbosity = level; +} + +struct json_object *describe_cb(void *closure) +{ + struct api_so_v1 *desc = closure; + const struct afb_verb_desc_v1 *verb; + struct json_object *r, *v, *f, *a; + + r = json_object_new_object(); + json_object_object_add(r, "version", json_object_new_int(1)); + json_object_object_add(r, "info", json_object_new_string(desc->binding->v1.info)); + v = json_object_new_object(); + json_object_object_add(r, "verbs", v); + verb = desc->binding->v1.verbs; + while (verb->name) { + f = json_object_new_object(); + a = json_object_new_array(); + json_object_object_add(f, "name", json_object_new_string(verb->name)); + json_object_object_add(f, "info", json_object_new_string(verb->info)); + if (verb->session & AFB_SESSION_CREATE) + json_object_array_add(a, json_object_new_string("session-create")); + if (verb->session & AFB_SESSION_CLOSE) + json_object_array_add(a, json_object_new_string("session-close")); + if (verb->session & AFB_SESSION_RENEW) + json_object_array_add(a, json_object_new_string("session-renew")); + if (verb->session & AFB_SESSION_CHECK) + json_object_array_add(a, json_object_new_string("session-check")); + if (verb->session & AFB_SESSION_LOA_EQ) { + const char *rel; + char buffer[80]; + switch (verb->session & AFB_SESSION_LOA_EQ) { + case AFB_SESSION_LOA_GE: rel = ">="; break; + case AFB_SESSION_LOA_LE: rel = "<="; break; + case AFB_SESSION_LOA_EQ: rel = "=="; break; + } + snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK)); + json_object_array_add(a, json_object_new_string(buffer)); + } + json_object_object_add(f, "flags", a); + json_object_object_add(v, verb->name, f); + verb++; + } + return r; +} + +static struct afb_api_itf so_v1_api_itf = { + .call = call_cb, + .service_start = service_start_cb, + .update_hooks = update_hooks_cb, + .get_verbosity = get_verbosity_cb, + .set_verbosity = set_verbosity_cb, + .describe = describe_cb +}; + +int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) { struct api_so_v1 *desc; struct afb_binding *(*register_function) (const struct afb_binding_interface *interface); - struct afb_verb_desc_v1 fake_verb; - struct afb_binding fake_binding; + struct afb_api afb_api; /* retrieves the register function */ register_function = dlsym(handle, afb_api_so_v1_register); @@ -217,22 +210,11 @@ int afb_api_so_v1_add(const char *path, void *handle) desc->handle = handle; /* init the interface */ - desc->interface.verbosity = verbosity; - desc->interface.mode = AFB_MODE_LOCAL; - desc->interface.daemon.itf = &daemon_itf; - desc->interface.daemon.closure = desc; - - /* for log purpose, a fake binding is needed here */ - desc->binding = &fake_binding; - fake_binding.type = AFB_BINDING_VERSION_1; - fake_binding.v1.info = path; - fake_binding.v1.prefix = path; - fake_binding.v1.verbs = &fake_verb; - fake_verb.name = NULL; + afb_ditf_init(&desc->ditf, path); /* init the binding */ NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register); - desc->binding = register_function(&desc->interface); + desc->binding = register_function(&desc->ditf.interface); if (desc->binding == NULL) { ERROR("binding [%s] register function failed. continuing...", path); goto error2; @@ -247,7 +229,7 @@ int afb_api_so_v1_add(const char *path, void *handle) ERROR("binding [%s] bad prefix...", path); goto error2; } - if (!afb_apis_is_valid_api_name(desc->binding->v1.prefix)) { + if (!afb_api_is_valid_name(desc->binding->v1.prefix)) { ERROR("binding [%s] invalid prefix...", path); goto error2; } @@ -261,11 +243,10 @@ int afb_api_so_v1_add(const char *path, void *handle) } /* records the binding */ - desc->apilength = strlen(desc->binding->v1.prefix); - if (afb_apis_add(desc->binding->v1.prefix, (struct afb_api){ - .closure = desc, - .call = call_cb, - .service_start = service_start_cb }) < 0) { + afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix); + afb_api.closure = desc; + afb_api.itf = &so_v1_api_itf; + if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) { ERROR("binding [%s] can't be registered...", path); goto error2; }