#include "afb-common.h"
#include "afb-context.h"
#include "afb-api-so.h"
-#include "afb-thread.h"
+#include "afb-xreq.h"
#include "verbose.h"
/*
return afb_common_rootdir_open_locale(filename, flags, locale);
}
-static int call_check(struct afb_req req, struct afb_context *context, const struct afb_verb_v2 *verb)
+static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb)
{
- int stag = (int)verb->session;
+ const struct afb_verb_v2 *result;
- 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 0;
- }
- }
-
- if ((stag & AFB_SESSION_CREATE) != 0) {
- if (afb_context_check_loa(context, 1)) {
- afb_req_fail(req, "failed", "invalid creation state");
- return 0;
- }
- afb_context_change_loa(context, 1);
- afb_context_refresh(context);
- }
-
- if ((stag & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0)
- afb_context_refresh(context);
-
- if ((stag & AFB_SESSION_CLOSE) != 0) {
- afb_context_change_loa(context, 0);
- afb_context_close(context);
- }
-
- if ((stag & AFB_SESSION_LOA_GE) != 0) {
- 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 0;
- }
- }
-
- if ((stag & AFB_SESSION_LOA_LE) != 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 0;
- }
- }
- return 1;
+ result = desc->binding->verbs;
+ while (result->verb && strcasecmp(result->verb, verb))
+ result++;
+ return result->verb ? result : NULL;
}
-static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *strverb)
+static void call_cb(void *closure, struct afb_xreq *xreq)
{
- const struct afb_verb_v2 *verb;
struct api_so_v2 *desc = closure;
+ const struct afb_verb_v2 *verb;
- verb = desc->binding->verbs;
- while (verb->verb && strcasecmp(verb->verb, strverb))
- verb++;
- if (!verb->verb)
- afb_req_fail_f(req, "unknown-verb", "verb %s unknown within api %s", strverb, desc->binding->api);
- else if (call_check(req, context, verb)) {
- afb_thread_req_call(req, verb->callback, afb_api_so_timeout, desc);
+ verb = search(desc, xreq->verb);
+ if (!verb)
+ afb_xreq_fail_f(xreq, "unknown-verb", "verb %s unknown within api %s", xreq->verb, desc->binding->api);
+ else {
+ xreq->sessionflags = (int)verb->session;
+ xreq->group = desc;
+ xreq->callback = verb->callback;
+ afb_xreq_call(xreq);
}
}