X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=7634dca176ab09c43dbc1427d2faa09ffbbdc144;hb=04331cc45e03325c6470bc5285d5c09843b24afd;hp=8fbd9fc9f453f84acd4fb2e20b521473168ce678;hpb=dde70b62b09f49ad672c104a3f81714bf11047be;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 8fbd9fc9..7634dca1 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -39,14 +39,18 @@
 
 #include "local-def.h"
 
+#include "afb-plugin.h"
 #include "afb-req-itf.h"
+#include "session.h"
 #include "afb-apis.h"
+#include "verbose.h"
 
 struct api_desc {
-	AFB_plugin *plugin;	/* descriptor */
+	struct AFB_plugin *plugin;	/* descriptor */
 	size_t prefixlen;
 	const char *prefix;
 	void *handle;		/* context of dlopen */
+	struct AFB_interface *interface;
 };
 
 static int api_timeout = 15;
@@ -72,48 +76,14 @@ void afb_apis_free_context(int apiidx, void *context)
 		free(context);
 }
 
-const struct AFB_restapi *afb_apis_get(int apiidx, int verbidx)
-{
-	assert(0 <= apiidx && apiidx < apis_count);
-	return &apis_array[apiidx].plugin->apis[verbidx];
-}
-
-int afb_apis_get_verbidx(int apiidx, const char *name)
-{
-	const struct AFB_restapi *apis;
-	int idx;
-
-	assert(0 <= apiidx && apiidx < apis_count);
-	apis = apis_array[apiidx].plugin->apis;
-	for (idx = 0 ; apis[idx].name ; idx++)
-		if (!strcasecmp(apis[idx].name, name))
-			return idx;
-	return -1;
-}
-
-int afb_apis_get_apiidx(const char *prefix, size_t length)
-{
-	int i;
-	const struct api_desc *a;
-
-	if (!length)
-		length = strlen(prefix);
-
-	for (i = 0 ; i < apis_count ; i++) {
-		a = &apis_array[i];
-		if (a->prefixlen == length && !strcasecmp(a->prefix, prefix))
-			return i;
-	}
-	return -1;
-}
-
 int afb_apis_add_plugin(const char *path)
 {
 	struct api_desc *apis;
-	AFB_plugin *plugin;
-	AFB_plugin *(*pluginRegisterFct) (void);
+	struct AFB_plugin *plugin;
+	struct AFB_plugin *(*pluginRegisterFct) (const struct AFB_interface *interface);
+	struct AFB_interface *interface;
 	void *handle;
-	size_t len;
+	int i;
 
 	// This is a loadable library let's check if it's a plugin
 	handle = dlopen(path, RTLD_NOW | RTLD_LOCAL);
@@ -128,7 +98,7 @@ int afb_apis_add_plugin(const char *path)
 		fprintf(stderr, "[%s] not an AFB plugin, continuing...\n", path);
 		goto error2;
 	}
-	if (verbose)
+	if (verbosity)
 		fprintf(stderr, "[%s] is a valid AFB plugin\n", path);
 
 	/* allocates enough memory */
@@ -139,50 +109,63 @@ int afb_apis_add_plugin(const char *path)
 	}
 	apis_array = apis;
 
+	/* allocates the interface */
+	interface = calloc(1, sizeof *interface);
+	if (interface == NULL) {
+		fprintf(stderr, "ERROR: plugin [%s] memory missing. continuing...\n", path);
+		goto error2;
+	}
+	interface->verbosity = 0;
+	interface->mode = AFB_MODE_LOCAL;
+
 	/* init the plugin */
-	plugin = pluginRegisterFct();
+	plugin = pluginRegisterFct(interface);
 	if (plugin == NULL) {
 		fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", path);
-		goto error2;
+		goto error3;
 	}
 
 	/* check the returned structure */
 	if (plugin->type != AFB_PLUGIN_JSON) {
 		fprintf(stderr, "ERROR: plugin [%s] invalid type %d...\n", path, plugin->type);
-		goto error2;
+		goto error3;
 	}
 	if (plugin->prefix == NULL || *plugin->prefix == 0) {
 		fprintf(stderr, "ERROR: plugin [%s] bad prefix...\n", path);
-		goto error2;
+		goto error3;
 	}
 	if (plugin->info == NULL || *plugin->info == 0) {
 		fprintf(stderr, "ERROR: plugin [%s] bad description...\n", path);
-		goto error2;
+		goto error3;
 	}
 	if (plugin->apis == NULL) {
 		fprintf(stderr, "ERROR: plugin [%s] no APIs...\n", path);
-		goto error2;
+		goto error3;
 	}
 
 	/* check previously existing plugin */
-	len = strlen(plugin->prefix);
-	if (afb_apis_get_apiidx(plugin->prefix, len) >= 0) {
-		fprintf(stderr, "ERROR: plugin [%s] prefix %s duplicated...\n", path, plugin->prefix);
-		goto error2;
+	for (i = 0 ; i < apis_count ; i++) {
+		if (!strcasecmp(apis_array[i].prefix, plugin->prefix)) {
+			fprintf(stderr, "ERROR: plugin [%s] prefix %s duplicated...\n", path, plugin->prefix);
+			goto error2;
+		}
 	}
 
 	/* record the plugin */
-	if (verbose)
+	if (verbosity)
 		fprintf(stderr, "Loading plugin[%lu] prefix=[%s] info=%s\n", (unsigned long)apis_count, plugin->prefix, plugin->info);
 	apis = &apis_array[apis_count];
 	apis->plugin = plugin;
-	apis->prefixlen = len;
+	apis->prefixlen = strlen(plugin->prefix);
 	apis->prefix = plugin->prefix;
 	apis->handle = handle;
+	apis->interface = interface;
 	apis_count++;
 
 	return 0;
 
+error3:
+	free(interface);
 error2:
 	dlclose(handle);
 error:
@@ -202,7 +185,7 @@ static int adddirs(char path[PATH_MAX], size_t end)
 		fprintf(stderr, "ERROR in scanning plugin directory %s, %m\n", path);
 		return -1;
 	}
-	if (verbose)
+	if (verbosity)
 		fprintf(stderr, "Scanning dir=[%s] for plugins\n", path);
 
 	/* scan each entry */
@@ -286,7 +269,7 @@ int afb_apis_add_pathset(const char *pathset)
 
 // Check of apiurl is declare in this plugin and call it
 extern __thread sigjmp_buf *error_handler;
-static void trapping_handle(AFB_request * request, struct json_object *(*cb)(AFB_request *,void*))
+static void trapping_handle(struct afb_req req, void(*cb)(struct afb_req))
 {
 	volatile int signum, timerset;
 	timer_t timerid;
@@ -299,7 +282,7 @@ static void trapping_handle(AFB_request * request, struct json_object *(*cb)(AFB
 	older = error_handler;
 	signum = setjmp(jmpbuf);
 	if (signum != 0) {
-		afb_req_fail_f(*request->areq, "aborted", "signal %d caught", signum);
+		afb_req_fail_f(req, "aborted", "signal %d caught", signum);
 	}
 	else {
 		error_handler = &jmpbuf;
@@ -320,46 +303,40 @@ static void trapping_handle(AFB_request * request, struct json_object *(*cb)(AFB
 			timer_settime(timerid, 0, &its, NULL);
 		}
 
-		cb(request, NULL);
+		cb(req);
 	}
 	if (timerset)
 		timer_delete(timerid);
 	error_handler = older;
 }
 
-static void handle(struct afb_req req, const struct api_desc *api, const struct AFB_restapi *verb)
+static void handle(struct afb_req req, const struct AFB_restapi *verb)
 {
-	AFB_request request;
-
-	request.uuid = request.url = "fake";
-	request.prefix = api->prefix;
-	request.method = verb->name;
-	request.context = NULL;
-	request.restfull = 0;
-	request.errcode = 0;
-	request.config = NULL;
-	request.areq = &req;
-
 	switch(verb->session) {
 	case AFB_SESSION_CREATE:
+		if (!afb_req_session_create(req))
+			return;
+		break;
 	case AFB_SESSION_RENEW:
-		/*if (check) new*/
+		if (!afb_req_session_check(req, 1))
+			return;
 		break;
 	case AFB_SESSION_CLOSE:
 	case AFB_SESSION_CHECK:
-		/*check*/
+		if (!afb_req_session_check(req, 0))
+			return;
 		break;
 	case AFB_SESSION_NONE:
 	default:
 		break;
 	}
-	trapping_handle(&request, verb->callback);
+	trapping_handle(req, verb->callback);
 
 	if (verb->session == AFB_SESSION_CLOSE)
-		/*close*/;
+		afb_req_session_close(req);
 }
 
-int afb_apis_handle(struct afb_req req, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+int afb_apis_handle(struct afb_req req, struct AFB_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
 	int i, j;
 	const struct api_desc *a;
@@ -371,7 +348,9 @@ int afb_apis_handle(struct afb_req req, const char *api, size_t lenapi, const ch
 			v = a->plugin->apis;
 			for (j = 0 ; v->name ; j++, v++) {
 				if (!strncasecmp(v->name, verb, lenverb) && !v->name[lenverb]) {
-					handle(req, a, v);
+					req.context = context->contexts[i];
+					handle(req, v);
+					context->contexts[i] = req.context;
 					return 1;
 				}
 			}