X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=e8e7ced355aa283735a7f9618bde805f34b3eaae;hb=5c1e761a2f84439b6e53ff1682ee665a7db2bca1;hp=1cc0648a089e9f920fa625358907c5711c607379;hpb=3d28e7d00cd8641bf600d47ed0e3e7e57cb5b439;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 1cc0648a..e8e7ced3 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -18,28 +18,15 @@
 
 #define _GNU_SOURCE
 
+#include <stdlib.h>
 #include <stdio.h>
-#include <assert.h>
 #include <string.h>
-#include <dirent.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/syscall.h>
-#include <setjmp.h>
-
-#include "afb-plugin.h"
-#include "afb-req-itf.h"
-#include "afb-poll-itf.h"
 
 #include "session.h"
-#include "afb-apis.h"
 #include "verbose.h"
-#include "utils-upoll.h"
+#include "afb-apis.h"
+#include "afb-context.h"
+#include <afb/afb-req-itf.h>
 
 struct api_desc {
 	struct afb_api api;
@@ -55,30 +42,52 @@ int afb_apis_count()
 	return apis_count;
 }
 
-void afb_apis_free_context(int apiidx, void *context)
+int afb_apis_is_valid_api_name(const char *name)
 {
-	const struct afb_api *api;
-	api = &apis_array[apiidx].api;
-	api->free_context(api->closure, context);
+	unsigned char c;
+
+	c = (unsigned char)*name;
+	if (c == 0)
+		return 0;
+	do {
+		if (c < (unsigned char)'\x80') {
+			switch(c) {
+			default:
+				if (c > ' ')
+					break;
+			case '"':
+			case '#':
+			case '%':
+			case '&':
+			case '\'':
+			case '/':
+			case '?':
+			case '`':
+			case '\\':
+			case '\x7f':
+				return 0;
+			}
+		}
+		c = (unsigned char)*++name;
+	} while(c != 0);
+	return 1;
 }
 
 int afb_apis_add(const char *name, struct afb_api api)
 {
 	struct api_desc *apis;
-	size_t len;
 	int i;
 
-	/* check existing or not */
-	len = strlen(name);
-	if (len == 0) {
-		fprintf(stderr, "empty api name forbidden\n");
+	/* Checks the api name */
+	if (!afb_apis_is_valid_api_name(name)) {
+		ERROR("invalid api name forbidden (name is '%s')", name);
 		goto error;
 	}
 
 	/* check previously existing plugin */
 	for (i = 0 ; i < apis_count ; i++) {
 		if (!strcasecmp(apis_array[i].name, name)) {
-			fprintf(stderr, "ERROR: api of name %s already exists\n", name);
+			ERROR("api of name %s already exists", name);
 			goto error;
 		}
 	}
@@ -86,7 +95,7 @@ int afb_apis_add(const char *name, struct afb_api api)
 	/* allocates enough memory */
 	apis = realloc(apis_array, ((unsigned)apis_count + 1) * sizeof * apis);
 	if (apis == NULL) {
-		fprintf(stderr, "out of memory\n");
+		ERROR("out of memory");
 		goto error;
 	}
 	apis_array = apis;
@@ -94,7 +103,7 @@ int afb_apis_add(const char *name, struct afb_api api)
 	/* record the plugin */
 	apis = &apis_array[apis_count];
 	apis->api = api;
-	apis->namelen = len;
+	apis->namelen = strlen(name);
 	apis->name = name;
 	apis_count++;
 
@@ -104,7 +113,12 @@ error:
 	return -1;
 }
 
-void afb_apis_call(struct afb_req req, struct AFB_clientCtx *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
+void afb_apis_call_(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
+{
+	afb_apis_call(req, context, api, strlen(api), verb, strlen(verb));
+}
+
+void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, size_t lenapi, const char *verb, size_t lenverb)
 {
 	int i;
 	const struct api_desc *a;
@@ -112,8 +126,8 @@ void afb_apis_call(struct afb_req req, struct AFB_clientCtx *context, const char
 	a = apis_array;
 	for (i = 0 ; i < apis_count ; i++, a++) {
 		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
-			req.context = &context->contexts[i];
-			a->api.call(a->api.closure, req, verb, lenverb);
+			context->api_index = i;
+			a->api.call(a->api.closure, req, context, verb, lenverb);
 			return;
 		}
 	}