Merge origin/master

[src/app-framework-binder.git] / src / rest-api.c

diff --git a/src/rest-api.c b/src/rest-api.c
index da937c4..0751ede 100644 (file)
--- a/src/rest-api.c
+++ b/src/rest-api.c
@@ -45,7 +45,7 @@ PUBLIC void endPostRequest(AFB_PostHandle *postHandle) {
     if (postHandle->type == AFB_POST_FORM) {
          if (verbose) fprintf(stderr, "End PostForm Request UID=%d\n", postHandle->uid);
     }
-    if (postHandle->private) free(postHandle->private);
+    if (postHandle->privatebuf) free(postHandle->privatebuf);
     free(postHandle);
 }
 
@@ -281,10 +281,11 @@ STATIC int doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key,
     
   // retrieve API request from Post iterator handle  
   AFB_PostHandle *postHandle  = (AFB_PostHandle*)cls;
-  AFB_request *request = (AFB_request*)postHandle->private;
+  AFB_request *request = (AFB_request*)postHandle->privatebuf;
   AFB_PostRequest postRequest;
   
-  fprintf (stderr, "postHandle key=%s filename=%s len=%d mime=%s\n", key, filename, size, mimetype);
+  if (verbose)
+    fprintf (stderr, "postHandle key=%s filename=%s len=%d mime=%s\n", key, filename, size, mimetype);
    
   // Create and Item value for Plugin API
   item.kind     = kind;
@@ -405,7 +406,7 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co
                 request = createRequest (connection, session, url);
                 if (request->jresp != NULL) goto ProcessApiCall;
                 postHandle->type   = AFB_POST_FORM;
-                postHandle->private= (void*)request;
+                postHandle->privatebuf = (void*)request;
                 postHandle->pp     = MHD_create_post_processor (connection, MAX_POST_SIZE, &doPostIterate, postHandle);
                 
                 if (NULL == postHandle->pp) {
@@ -430,7 +431,7 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co
 
                 // Size is OK, let's allocate a buffer to hold post data
                 postHandle->type = AFB_POST_JSON;
-                postHandle->private = malloc(contentlen + 1); // allocate memory for full POST data + 1 for '\0' enf of string
+                postHandle->privatebuf = malloc(contentlen + 1); // allocate memory for full POST data + 1 for '\0' enf of string
 
                 // if (verbose) fprintf(stderr, "Create PostJson[uid=%d] Size=%d\n", postHandle->uid, contentlen);
                 return MHD_YES;
@@ -455,7 +456,7 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co
             // Process JsonPost request when buffer is completed let's call API    
             if (postHandle->type == AFB_POST_JSON) {
                 // if (verbose) fprintf(stderr, "Updating PostJson[uid=%d]\n", postHandle->uid);
-                memcpy(&postHandle->private[postHandle->len], upload_data, *upload_data_size);
+                memcpy(&postHandle->privatebuf[postHandle->len], upload_data, *upload_data_size);
                 postHandle->len = postHandle->len + *upload_data_size;
             }
             
@@ -491,8 +492,8 @@ PUBLIC int doRestApi(struct MHD_Connection *connection, AFB_session *session, co
                 }
 
                 // Before processing data, make sure buffer string is properly ended
-                postHandle->private[postHandle->len] = '\0';
-                postRequest.data = postHandle->private;
+                postHandle->privatebuf[postHandle->len] = '\0';
+                postRequest.data = postHandle->privatebuf;
                 request->post = &postRequest;
 
                 // if (verbose) fprintf(stderr, "Close Post[%d] Buffer=%s\n", postHandle->uid, request->post->data);
@@ -563,15 +564,15 @@ STATIC AFB_plugin ** RegisterJsonPlugins(AFB_plugin **plugins) {
               
             // Prebuild each API jtype to boost API json response
             for (jdx = 0; plugins[idx]->apis[jdx].name != NULL; jdx++) {
-                AFB_privateApi *private = malloc (sizeof (AFB_privateApi));
-                if (plugins[idx]->apis[jdx].private != NULL) {
+                AFB_privateApi *privateapi = malloc (sizeof (AFB_privateApi));
+                if (plugins[idx]->apis[jdx].privateapi != NULL) {
                     fprintf (stderr, "WARNING: plugin=%s api=%s private handle should be NULL=0x%x\n"
-                            ,plugins[idx]->prefix,plugins[idx]->apis[jdx].name, plugins[idx]->apis[jdx].private);
+                            ,plugins[idx]->prefix,plugins[idx]->apis[jdx].name, plugins[idx]->apis[jdx].privateapi);
                 }
-                private->len = strlen (plugins[idx]->apis[jdx].name);
-                private->jtype=json_object_new_string(plugins[idx]->apis[jdx].name);
-                json_object_get(private->jtype); // increase reference count to make it permanent
-                plugins[idx]->apis[jdx].private = private;
+                privateapi->len = strlen (plugins[idx]->apis[jdx].name);
+                privateapi->jtype=json_object_new_string(plugins[idx]->apis[jdx].name);
+                json_object_get(privateapi->jtype); // increase reference count to make it permanent
+                plugins[idx]->apis[jdx].privateapi = privateapi;
             }
         }
     }
@@ -637,17 +638,18 @@ STATIC void scanDirectory(char *dirpath, int dirfd, AFB_plugin **plugins, int *c
             }
 
             if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading pos[%d]\n", pluginDir.d_name, *count);
-            plugins[*count] = (AFB_plugin *) malloc (sizeof(AFB_plugin));
-            plugins[*count] = (**pluginRegisterFct)();
-            *count = *count +1;
-
+            plugins[*count] = pluginRegisterFct();
+            if (!plugins[*count]) {
+                if (verbose) fprintf(stderr, "ERROR: plugin [%s] register function failed. continuing...\n", pluginDir.d_name);
+            } else
+                *count = *count +1;
         }
     }
     closedir (dir);
 }
 
 void initPlugins(AFB_session *session) {
-    static AFB_plugin **plugins;
+    AFB_plugin **plugins;
     
     afbJsonType = json_object_new_string (AFB_MSG_JTYPE);
     int count = 0;
@@ -655,7 +657,7 @@ void initPlugins(AFB_session *session) {
     int dirfd;
 
     /* pre-allocate for AFB_MAX_PLUGINS plugins, we will downsize later */
-    plugins = (AFB_plugin **) malloc (AFB_MAX_PLUGINS *sizeof(AFB_plugin));
+    plugins = (AFB_plugin **) malloc (AFB_MAX_PLUGINS *sizeof(AFB_plugin*));
     
     // Loop on every directory passed in --plugins=xxx
     while (dirpath = strsep(&session->config->ldpaths, ":")) {
@@ -674,7 +676,7 @@ void initPlugins(AFB_session *session) {
     }
     
     // downsize structure to effective number of loaded plugins
-    plugins = (AFB_plugin **)realloc (plugins, (count+1)*sizeof(AFB_plugin));
+    plugins = (AFB_plugin **)realloc (plugins, (count+1)*sizeof(AFB_plugin*));
     plugins[count] = NULL;
 
     // complete plugins and save them within current sessions