#include <string.h>
#include <dlfcn.h>
#include <assert.h>
+#include <stdarg.h>
-#include <afb/afb-binding-v2.h>
#include <json-c/json.h>
+#include <afb/afb-binding-v2.h>
#include "afb-api.h"
#include "afb-api-so-v2.h"
static const char afb_api_so_v2_descriptor[] = "afbBindingV2";
static const char afb_api_so_v2_data[] = "afbBindingV2data";
-/*
- * Description of a binding
- */
-struct api_so_v2 {
- const struct afb_binding_v2 *binding; /* descriptor */
- void *handle; /* context of dlopen */
- struct afb_export *export; /* exportations */
-};
-
-static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *name)
+static const struct afb_verb_v2 *search(const struct afb_binding_v2 *binding, const char *name)
{
const struct afb_verb_v2 *verb;
- verb = desc->binding->verbs;
+ verb = binding->verbs;
while (verb->verb && strcasecmp(verb->verb, name))
verb++;
return verb->verb ? verb : NULL;
return NULL;
}
-static void call_cb(void *closure, struct afb_xreq *xreq)
+void afb_api_so_v2_process_call(const struct afb_binding_v2 *binding, struct afb_xreq *xreq)
{
- struct api_so_v2 *desc = closure;
const struct afb_verb_v2 *verb;
- xreq->request.dynapi = (void*)desc->export; /* hack: this avoids to export afb_export structure */
- verb = search(desc, xreq->request.verb);
+ verb = search(binding, xreq->request.called_verb);
afb_xreq_call_verb_v2(xreq, verb);
}
-static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
-{
- struct api_so_v2 *desc = closure;
- return afb_export_start(desc->export, share_session, onneed, apiset);
-}
-
-static void update_hooks_cb(void *closure)
-{
- struct api_so_v2 *desc = closure;
- afb_export_update_hook(desc->export);
-}
-
-static int get_verbosity_cb(void *closure)
-{
- struct api_so_v2 *desc = closure;
- return afb_export_verbosity_get(desc->export);
-}
-
-static void set_verbosity_cb(void *closure, int level)
-{
- struct api_so_v2 *desc = closure;
- afb_export_verbosity_set(desc->export, level);
-}
-
-static struct json_object *make_description_openAPIv3(struct api_so_v2 *desc)
+struct json_object *afb_api_so_v2_make_description_openAPIv3(const struct afb_binding_v2 *binding, const char *apiname)
{
char buffer[256];
const struct afb_verb_v2 *verb;
struct json_object *r, *f, *a, *i, *p, *g;
+
+ if (binding->specification) {
+ r = json_tokener_parse(binding->specification);
+ if (r)
+ return r;
+ }
+
r = json_object_new_object();
json_object_object_add(r, "openapi", json_object_new_string("3.0.0"));
i = json_object_new_object();
json_object_object_add(r, "info", i);
- json_object_object_add(i, "title", json_object_new_string(afb_export_apiname(desc->export)));
+ json_object_object_add(i, "title", json_object_new_string(apiname));
json_object_object_add(i, "version", json_object_new_string("0.0.0"));
- json_object_object_add(i, "description", json_object_new_string(desc->binding->info ?: afb_export_apiname(desc->export)));
+ json_object_object_add(i, "description", json_object_new_string(binding->info ?: apiname));
p = json_object_new_object();
json_object_object_add(r, "paths", p);
- verb = desc->binding->verbs;
+ verb = binding->verbs;
while (verb->verb) {
buffer[0] = '/';
strncpy(buffer + 1, verb->verb, sizeof buffer - 1);
return r;
}
-static struct json_object *describe_cb(void *closure)
-{
- struct api_so_v2 *desc = closure;
- struct json_object *r = desc->binding->specification ? json_tokener_parse(desc->binding->specification) : NULL;
- if (!r)
- r = make_description_openAPIv3(desc);
- return r;
-}
-
-static struct afb_api_itf so_v2_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_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *apiset, struct afb_binding_data_v2 *data)
+int afb_api_so_v2_add_binding(const struct afb_binding_v2 *binding, void *handle, struct afb_apiset *declare_set, struct afb_apiset * call_set, struct afb_binding_data_v2 *data)
{
int rc;
- struct api_so_v2 *desc;
- struct afb_api afb_api;
struct afb_export *export;
/* basic checks */
assert(data);
/* allocates the description */
- export = afb_export_create_v2(apiset, binding->api, data, binding->init, binding->onevent);
- desc = calloc(1, sizeof *desc);
- if (!desc || !export) {
+ export = afb_export_create_v2(declare_set, call_set, binding->api, binding, data, binding->init, binding->onevent);
+ if (!export) {
ERROR("out of memory");
goto error;
}
- desc->binding = binding;
- desc->handle = handle;
- desc->export = export;
+ /* records the binding */
+ if (afb_export_declare(export, binding->noconcurrency) < 0) {
+ ERROR("binding %s can't be registered to set %s...", afb_export_apiname(export), afb_apiset_name(declare_set));
+ goto error;
+ }
/* init the binding */
if (binding->preinit) {
INFO("binding %s calling preinit function", binding->api);
rc = binding->preinit();
if (rc < 0) {
- ERROR("binding %s preinit function failed...", afb_export_apiname(desc->export));
+ ERROR("binding %s preinit function failed...", afb_export_apiname(export));
+ afb_export_undeclare(export);
goto error;
}
}
- /* records the binding */
- afb_api.closure = desc;
- afb_api.itf = &so_v2_api_itf;
- afb_api.group = binding->noconcurrency ? export : NULL;
- if (afb_apiset_add(apiset, afb_export_apiname(desc->export), afb_api) < 0) {
- ERROR("binding %s can't be registered to set %s...", afb_export_apiname(desc->export), afb_apiset_name(apiset));
- goto error;
- }
- INFO("binding %s added to set %s", afb_export_apiname(desc->export), afb_apiset_name(apiset));
+ INFO("binding %s added to set %s", afb_export_apiname(export), afb_apiset_name(declare_set));
return 1;
error:
- afb_export_destroy(export);
- free(desc);
+ afb_export_unref(export);
return -1;
}
-int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *apiset)
+int afb_api_so_v2_add(const char *path, void *handle, struct afb_apiset *declare_set, struct afb_apiset * call_set)
{
const struct afb_binding_v2 *binding;
struct afb_binding_data_v2 *data;
ERROR("binding [%s] bad api name...", path);
goto error;
}
- if (!afb_api_is_valid_name(binding->api, 1)) {
+ if (!afb_api_is_valid_name(binding->api)) {
ERROR("binding [%s] invalid api name...", path);
goto error;
}
-#if 0
- if (binding->specification == NULL || *binding->specification == 0) {
- ERROR("binding [%s] bad specification...", path);
- goto error;
- }
-#endif
+
if (binding->verbs == NULL) {
ERROR("binding [%s] no verbs...", path);
goto error;
}
- return afb_api_so_v2_add_binding(binding, handle, apiset, data);
+ return afb_api_so_v2_add_binding(binding, handle, declare_set, call_set, data);
error:
return -1;
Code Review / src / app-framework-binder.git / blobdiff