X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-apis.c;h=7db3e75ad935adb6939ac380cd378a45506b3818;hb=13bd63c1bd4055cba1316042267b31c4776af256;hp=5ebc96ffb433cb095b20e64f36a9c7f460dd4e8b;hpb=06382af9092babedbf56aa1c00b3bd7cb0b86cda;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 5ebc96ff..7db3e75a 100644
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
@@ -22,10 +22,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "session.h"
+#include "afb-session.h"
 #include "verbose.h"
 #include "afb-apis.h"
 #include "afb-context.h"
+#include "afb-hook.h"
 #include <afb/afb-req-itf.h>
 
 struct api_desc {
@@ -42,16 +43,45 @@ int afb_apis_count()
 	return apis_count;
 }
 
+int afb_apis_is_valid_api_name(const char *name)
+{
+	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) {
-		ERROR("empty api name forbidden");
+	/* Checks the api name */
+	if (!afb_apis_is_valid_api_name(name)) {
+		ERROR("invalid api name forbidden (name is '%s')", name);
 		goto error;
 	}
 
@@ -74,7 +104,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++;
 
@@ -94,6 +124,7 @@ void afb_apis_call(struct afb_req req, struct afb_context *context, const char *
 	int i;
 	const struct api_desc *a;
 
+	req = afb_hook_req_call(req, context, api, lenapi, verb, lenverb);
 	a = apis_array;
 	for (i = 0 ; i < apis_count ; i++, a++) {
 		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
@@ -105,3 +136,27 @@ void afb_apis_call(struct afb_req req, struct afb_context *context, const char *
 	afb_req_fail(req, "fail", "api not found");
 }
 
+int afb_apis_start_service(const char *api, int share_session, int onneed)
+{
+	int i;
+
+	for (i = 0 ; i < apis_count ; i++) {
+		if (!strcasecmp(apis_array[i].name, api))
+			return apis_array[i].api.service_start(apis_array[i].api.closure, share_session, onneed);
+	}
+	ERROR("can't find service %s", api);
+	return -1;
+}
+
+int afb_apis_start_all_services(int share_session)
+{
+	int i, rc;
+
+	for (i = 0 ; i < apis_count ; i++) {
+		rc = apis_array[i].api.service_start(apis_array[i].api.closure, share_session, 1);
+		if (rc < 0)
+			return rc;
+	}
+	return 0;
+}
+