/*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <assert.h>
#include <string.h>
#include <dirent.h>
+#include <errno.h>
#include <dlfcn.h>
#include <unistd.h>
#include <limits.h>
#include <afb/afb-req-itf.h>
#include <afb/afb-event-itf.h>
-#include "session.h"
+#include "afb-session.h"
#include "afb-common.h"
#include "afb-context.h"
#include "afb-apis.h"
#include "afb-api-so.h"
-#include "afb-sig-handler.h"
+#include "afb-thread.h"
#include "afb-evt.h"
#include "afb-svc.h"
#include "verbose.h"
struct afb_binding_interface interface; /* interface for the binding */
};
-struct monitoring {
- struct afb_req req;
- void (*action)(struct afb_req);
-};
-
static const char binding_register_function_v1[] = "afbBindingV1Register";
static const char binding_service_init_function_v1[] = "afbBindingV1ServiceInit";
static const char binding_service_event_function_v1[] = "afbBindingV1ServiceEvent";
return afb_common_rootdir_open_locale(filename, flags, locale);
}
-static void monitored_call(int signum, void *arg)
-{
- struct monitoring *data = arg;
- if (signum != 0)
- afb_req_fail_f(data->req, "aborted", "signal %s(%d) caught", strsignal(signum), signum);
- else
- data->action(data->req);
-}
-
-static void call_check(struct afb_req req, struct afb_context *context, const struct afb_verb_desc_v1 *verb)
+static int call_check(struct afb_req req, struct afb_context *context, const struct afb_verb_desc_v1 *verb)
{
- struct monitoring data;
-
int stag = (int)verb->session;
if ((stag & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
if (!afb_context_check(context)) {
afb_context_close(context);
afb_req_fail(req, "failed", "invalid token's identity");
- return;
+ return 0;
}
}
if ((stag & AFB_SESSION_CREATE) != 0) {
if (afb_context_check_loa(context, 1)) {
afb_req_fail(req, "failed", "invalid creation state");
- return;
+ return 0;
}
afb_context_change_loa(context, 1);
afb_context_refresh(context);
int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
if (!afb_context_check_loa(context, loa)) {
afb_req_fail(req, "failed", "invalid LOA");
- return;
+ return 0;
}
}
int loa = (stag >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
if (afb_context_check_loa(context, loa + 1)) {
afb_req_fail(req, "failed", "invalid LOA");
- return;
+ return 0;
}
}
-
- data.req = req;
- data.action = verb->callback;
- afb_sig_monitor(monitored_call, &data, api_timeout);
+ return 1;
}
-static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *verb, size_t lenverb)
+static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *strverb)
{
- const struct afb_verb_desc_v1 *v;
+ const struct afb_verb_desc_v1 *verb;
struct api_so_desc *desc = closure;
- v = desc->binding->v1.verbs;
- while (v->name && (strncasecmp(v->name, verb, lenverb) || v->name[lenverb]))
- v++;
- if (v->name)
- call_check(req, context, v);
- else
- afb_req_fail_f(req, "unknown-verb", "verb %.*s unknown within api %s", (int)lenverb, verb, desc->binding->v1.prefix);
+ verb = desc->binding->v1.verbs;
+ while (verb->name && strcasecmp(verb->name, strverb))
+ verb++;
+ if (!verb->name)
+ afb_req_fail_f(req, "unknown-verb", "verb %s unknown within api %s", strverb, desc->binding->v1.prefix);
+ else if (call_check(req, context, verb)) {
+ afb_thread_req_call(req, verb->callback, api_timeout, desc);
+ }
}
static int service_start_cb(void *closure, int share_session, int onneed)
rc = 0;
handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
if (handle == NULL) {
- ERROR("binding [%s] not loadable", path);
+ ERROR("binding [%s] not loadable: %s", path, dlerror());
goto error;
}
static int adddirs(char path[PATH_MAX], size_t end)
{
DIR *dir;
- struct dirent ent, *result;
+ struct dirent *dent;
size_t len;
/* open the DIR now */
if (end)
path[end++] = '/';
for (;;) {
- readdir_r(dir, &ent, &result);
- if (result == NULL)
+ errno = 0;
+ dent = readdir(dir);
+ if (dent == NULL) {
+ if (errno != 0)
+ ERROR("read error while scanning directory %.*s: %m", (int)(end - 1), path);
break;
+ }
- len = strlen(ent.d_name);
+ len = strlen(dent->d_name);
if (len + end >= PATH_MAX) {
- ERROR("path too long while scanning bindings for %s", ent.d_name);
+ ERROR("path too long while scanning bindings for %s", dent->d_name);
continue;
}
- memcpy(&path[end], ent.d_name, len+1);
- if (ent.d_type == DT_DIR) {
+ if (dent->d_type == DT_DIR) {
/* case of directories */
- if (ent.d_name[0] == '.') {
+ if (dent->d_name[0] == '.') {
if (len == 1)
continue;
- if (ent.d_name[1] == '.' && len == 2)
+ if (dent->d_name[1] == '.' && len == 2)
continue;
}
+ memcpy(&path[end], dent->d_name, len+1);
adddirs(path, end+len);;
- } else if (ent.d_type == DT_REG) {
+ } else if (dent->d_type == DT_REG) {
/* case of files */
- if (!strstr(ent.d_name, ".so"))
+ if (memcmp(&dent->d_name[len - 3], ".so", 4))
continue;
+ memcpy(&path[end], dent->d_name, len+1);
if (afb_api_so_add_binding(path) < 0)
return -1;
}
Code Review / src / app-framework-binder.git / blobdiff