X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-so-v1.c;h=c1f270938a60523053f2371ffd407a3155a8405d;hb=95c29ef579d6320a721f96d7146efd10f74a201b;hp=5292cfe66d3efbedc8ebc00d64707342fd2fb655;hpb=968c3fca18c7518f240d2487a561e8df8b2907a7;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c index 5292cfe6..c1f27093 100644 --- a/src/afb-api-so-v1.c +++ b/src/afb-api-so-v1.c @@ -16,15 +16,18 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include #include -#include +#include + +#include #include "afb-api.h" +#include "afb-api-so-v1.h" #include "afb-apiset.h" #include "afb-svc.h" #include "afb-evt.h" @@ -46,9 +49,10 @@ static const char afb_api_so_v1_service_event[] = "afbBindingV1ServiceEvent"; * Description of a binding */ struct api_so_v1 { - struct afb_binding *binding; /* descriptor */ + struct afb_binding_v1 *binding; /* descriptor */ void *handle; /* context of dlopen */ struct afb_svc *service; /* handler for service started */ + struct afb_binding_interface_v1 interface; struct afb_ditf ditf; /* daemon interface */ }; @@ -68,11 +72,7 @@ static void call_cb(void *closure, struct afb_xreq *xreq) struct api_so_v1 *desc = closure; verb = search(desc, xreq->verb); - if (!verb) - afb_xreq_fail_unknown_verb(xreq); - else - if (!xreq_session_check_apply(xreq, verb->session)) - afb_xreq_call(xreq, verb->callback); + afb_xreq_call_verb_v1(xreq, verb); } static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset) @@ -107,7 +107,7 @@ static int service_start_cb(void *closure, int share_session, int onneed, struct /* get the event handler if any */ onevent = dlsym(desc->handle, afb_api_so_v1_service_event); - desc->service = afb_svc_create(apiset, share_session, init, onevent); + desc->service = afb_svc_create_v1(apiset, share_session, init, onevent); if (desc->service == NULL) { /* starting error */ ERROR("Starting service %s failed", desc->binding->v1.prefix); @@ -126,13 +126,54 @@ static void update_hooks_cb(void *closure) static int get_verbosity_cb(void *closure) { struct api_so_v1 *desc = closure; - return desc->ditf.interface.verbosity; + return desc->interface.verbosity; } static void set_verbosity_cb(void *closure, int level) { struct api_so_v1 *desc = closure; - desc->ditf.interface.verbosity = level; + desc->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_CLOSE_V1) + json_object_array_add(a, json_object_new_string("session-close")); + if (verb->session & AFB_SESSION_RENEW_V1) + json_object_array_add(a, json_object_new_string("session-renew")); + if (verb->session & AFB_SESSION_CHECK_V1) + json_object_array_add(a, json_object_new_string("session-check")); + if (verb->session & AFB_SESSION_LOA_EQ_V1) { + const char *rel = "?"; + char buffer[80]; + switch (verb->session & AFB_SESSION_LOA_EQ_V1) { + case AFB_SESSION_LOA_GE_V1: rel = ">="; break; + case AFB_SESSION_LOA_LE_V1: rel = "<="; break; + case AFB_SESSION_LOA_EQ_V1: rel = "=="; break; + } + snprintf(buffer, sizeof buffer, "LOA%s%d", rel, (int)((verb->session >> AFB_SESSION_LOA_SHIFT_V1) & AFB_SESSION_LOA_MASK_V1)); + 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 = { @@ -140,13 +181,14 @@ static struct afb_api_itf so_v1_api_itf = { .service_start = service_start_cb, .update_hooks = update_hooks_cb, .get_verbosity = get_verbosity_cb, - .set_verbosity = set_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_binding_v1 *(*register_function) (const struct afb_binding_interface_v1 *interface); struct afb_api afb_api; /* retrieves the register function */ @@ -164,11 +206,11 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) desc->handle = handle; /* init the interface */ - afb_ditf_init(&desc->ditf, path); + afb_ditf_init_v1(&desc->ditf, path, &desc->interface); /* init the binding */ - NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register); - desc->binding = register_function(&desc->ditf.interface); + INFO("binding [%s] calling registering function %s", path, afb_api_so_v1_register); + desc->binding = register_function(&desc->interface); if (desc->binding == NULL) { ERROR("binding [%s] register function failed. continuing...", path); goto error2; @@ -204,7 +246,7 @@ int afb_api_so_v1_add(const char *path, void *handle, struct afb_apiset *apiset) ERROR("binding [%s] can't be registered...", path); goto error2; } - NOTICE("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); + INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix); return 1; error2: