provides developper files

[src/app-framework-binder.git] / src / afb-apis.c

diff --git a/src/afb-apis.c b/src/afb-apis.c
index 561b275..5ebc96f 100644 (file)
--- a/src/afb-apis.c
+++ b/src/afb-apis.c
@@ -3,48 +3,30 @@
  * Author "Fulup Ar Foll"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contain all generic part to handle REST/API
- * 
- *  https://www.gnu.org/software/libmicrohttpd/tutorial.html [search 'largepost.c']
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #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;
@@ -60,13 +42,6 @@ int afb_apis_count()
        return apis_count;
 }
 
-void afb_apis_free_context(int apiidx, void *context)
-{
-       const struct afb_api *api;
-       api = &apis_array[apiidx].api;
-       api->free_context(api->closure, context);
-}
-
 int afb_apis_add(const char *name, struct afb_api api)
 {
        struct api_desc *apis;
@@ -76,14 +51,14 @@ int afb_apis_add(const char *name, struct afb_api api)
        /* check existing or not */
        len = strlen(name);
        if (len == 0) {
-               fprintf(stderr, "empty api name forbidden\n");
+               ERROR("empty api name forbidden");
                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;
                }
        }
@@ -91,7 +66,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;
@@ -109,7 +84,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;
@@ -117,8 +97,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;
                }
        }