aboutsummaryrefslogtreecommitdiffstats
path: root/src/afb-api-so-v1.c
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-03-31 16:11:07 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-03-31 16:14:02 +0200
commit6797f9722dd3e5463e0f7c118397955bb59a40c7 (patch)
tree05f6aaf980d4080f871fc368509ff0156eaaec3b /src/afb-api-so-v1.c
parent20ea5089d0e5526afaa5231f30add7b25b2499bd (diff)
Factorize common code for handling requests
The common code for session handling is shared using struct afb_xreq. At the moment only hreq leverages the new feature. The objective is double: make the work of writing new internal requests more easy and prepare to check permissions. Change-Id: If3ca311d68c2d8c427d1125f31a2704b150c2c94 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'src/afb-api-so-v1.c')
-rw-r--r--src/afb-api-so-v1.c35
1 files changed, 31 insertions, 4 deletions
diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 4fafb138..a09b0f51 100644
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -31,6 +31,7 @@
#include "afb-context.h"
#include "afb-api-so.h"
#include "afb-thread.h"
+#include "afb-xreq.h"
#include "verbose.h"
/*
@@ -173,21 +174,46 @@ static int call_check(struct afb_req req, struct afb_context *context, const str
return 1;
}
-static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *strverb)
+static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name)
{
const struct afb_verb_desc_v1 *verb;
- struct api_so_v1 *desc = closure;
verb = desc->binding->v1.verbs;
- while (verb->name && strcasecmp(verb->name, strverb))
+ while (verb->name && strcasecmp(verb->name, name))
verb++;
- if (!verb->name)
+ return verb->name ? verb : NULL;
+}
+
+static void call_cb(void *closure, struct afb_req req, struct afb_context *context, const char *strverb)
+{
+ const struct afb_verb_desc_v1 *verb;
+ struct api_so_v1 *desc = closure;
+
+ verb = search(desc, strverb);
+ if (!verb)
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, afb_api_so_timeout, desc);
}
}
+static void xcall_cb(void *closure, struct afb_xreq *xreq)
+{
+ const struct afb_verb_desc_v1 *verb;
+ struct api_so_v1 *desc = closure;
+
+ 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);
+ }
+}
+
static int service_start_cb(void *closure, int share_session, int onneed)
{
int (*init)(struct afb_service service);
@@ -300,6 +326,7 @@ int afb_api_so_v1_add(const char *path, void *handle)
if (afb_apis_add(desc->binding->v1.prefix, (struct afb_api){
.closure = desc,
.call = call_cb,
+ .xcall = xcall_cb,
.service_start = service_start_cb }) < 0) {
ERROR("binding [%s] can't be registered...", path);
goto error2;