X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fafb-apis.c;h=3463f535c12bb1454ac314bd43deffdc3d8ec9dc;hb=44f21bd2a3b50f92669223cdafe79993654c1e19;hp=da0b98f050592ffead96be2cf15dadce9a791b6b;hpb=f1b901ed676b2d45ec8e6ae3d6ef2f94d79f9ee6;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-apis.c b/src/afb-apis.c
index da0b98f0..3463f535 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>
  *
@@ -21,44 +21,95 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
-#include "session.h"
+#include "afb-session.h"
 #include "verbose.h"
 #include "afb-apis.h"
 #include "afb-context.h"
-#include "afb-req-itf.h"
+#include "afb-hook.h"
+#include <afb/afb-req-itf.h>
 
 struct api_desc {
 	struct afb_api api;
 	const char *name;
-	size_t namelen;
 };
 
 static struct api_desc *apis_array = NULL;
 static int apis_count = 0;
 
+/**
+ * Returns the current count of APIs
+ */
 int afb_apis_count()
 {
 	return apis_count;
 }
 
+/**
+ * Checks wether 'name' is a valid API name.
+ * @return 1 if valid, 0 otherwise
+ */
+int afb_apis_is_valid_api_name(const char *name)
+{
+	unsigned char c;
+
+	c = (unsigned char)*name;
+	if (c == 0)
+		/* empty names aren't valid */
+		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;
+}
+
+/**
+ * Adds the api of 'name' described by 'api'.
+ * @param name the name of the api to add
+ * @param api the api
+ * @returns 0 in case of success or -1 in case
+ * of error with errno set:
+ *   - EINVAL if name isn't valid
+ *   - EEXIST if name already registered
+ *   - ENOMEM when out of memory
+ */
 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);
+		errno = EINVAL;
 		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);
+			errno = EEXIST;
 			goto error;
 		}
 	}
@@ -66,7 +117,8 @@ 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");
+		errno = ENOMEM;
 		goto error;
 	}
 	apis_array = apis;
@@ -74,7 +126,6 @@ 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->name = name;
 	apis_count++;
 
@@ -84,24 +135,44 @@ error:
 	return -1;
 }
 
-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)
+void afb_apis_call(struct afb_req req, struct afb_context *context, const char *api, const char *verb)
 {
 	int i;
 	const struct api_desc *a;
 
+	req = afb_hook_req_call(req, context, api, verb);
 	a = apis_array;
 	for (i = 0 ; i < apis_count ; i++, a++) {
-		if (a->namelen == lenapi && !strncasecmp(a->name, api, lenapi)) {
+		if (!strcasecmp(a->name, api)) {
 			context->api_index = i;
-			a->api.call(a->api.closure, req, context, verb, lenverb);
+			a->api.call(a->api.closure, req, context, verb);
 			return;
 		}
 	}
 	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;
+}
+