X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Frest-api.c;h=e19e1f2be74922673cec37078e086ff4bdebcbfc;hb=06d422d1de5c505366f6a029d8af85548c2b646f;hp=3ae9cc0eb3635b280a61ed13a7406915db74d2f9;hpb=cf2b7c5be026071b696c62a8b0f260e624c9a357;p=src%2Fapp-framework-binder.git

diff --git a/src/rest-api.c b/src/rest-api.c
index 3ae9cc0e..e19e1f2b 100644
--- a/src/rest-api.c
+++ b/src/rest-api.c
@@ -128,7 +128,7 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context)
                     };
                     
                     if (verbose) fprintf(stderr, "Plugin=[%s] Api=[%s] Middleware=[%d] Client=[0x%x] Uuid=[%s] Token=[%s]\n"
-                           , request->plugin, request->api, plugin->apis[idx].session, clientCtx, clientCtx->uuid, clientCtx->token);                        
+                           , request->prefix, request->api, plugin->apis[idx].session, clientCtx, clientCtx->uuid, clientCtx->token);                        
                     
                     switch(plugin->apis[idx].session) {
 
@@ -195,9 +195,12 @@ STATIC AFB_error callPluginApi(AFB_request *request, int plugidx, void *context)
                     }
                 }
                 
-                // Effectively call the API with a subset of the context
+                // Effectively CALL PLUGIN API with a subset of the context
                 jresp = plugin->apis[idx].callback(request, context);
                 
+                // Store context in case it was updated by plugins
+                clientCtx->contexts[plugidx] = request->context;               
+                
                 // handle intermediary Post Iterates out of band
                 if ((jresp == NULL) && (request->errcode == MHD_HTTP_OK)) return (AFB_SUCCESS);
 
@@ -233,24 +236,24 @@ STATIC AFB_error findAndCallApi (AFB_request *request, void *context) {
     int idx;
     AFB_error status;
     
-    if (!request->api || !request->plugin) return (AFB_FAIL);
+    if (!request->api || !request->prefix) return (AFB_FAIL);
    
     // Search for a plugin with this urlpath
     for (idx = 0; request->plugins[idx] != NULL; idx++) {
-        if (!strcmp(request->plugins[idx]->prefix, request->plugin)) {
+        if (!strcmp(request->plugins[idx]->prefix, request->prefix)) {
             status =callPluginApi(request, idx, context);
             break;
         }
     }
     // No plugin was found
     if (request->plugins[idx] == NULL) {
-        request->jresp = jsonNewMessage(AFB_FATAL, "No Plugin=[%s] Url=%s", request->plugin, request->url);
+        request->jresp = jsonNewMessage(AFB_FATAL, "No Plugin=[%s] Url=%s", request->prefix, request->url);
         goto ExitOnError;
     }  
     
     // plugin callback did not return a valid Json Object
     if (status == AFB_FAIL) {
-        request->jresp = jsonNewMessage(AFB_FATAL, "No API=[%s] for Plugin=[%s] url=[%s]", request->api, request->plugin, request->url);
+        request->jresp = jsonNewMessage(AFB_FATAL, "No API=[%s] for Plugin=[%s] url=[%s]", request->api, request->prefix, request->url);
         goto ExitOnError;
     }
     
@@ -306,7 +309,7 @@ doPostIterate (void *cls, enum MHD_ValueKind kind, const char *key,
 
 STATIC void freeRequest (AFB_request *request) {
 
- free (request->plugin);    
+ free (request->prefix);    
  free (request->api);    
  free (request);    
 }
@@ -314,7 +317,8 @@ STATIC void freeRequest (AFB_request *request) {
 STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_session *session, const char* url) {
     
     AFB_request *request;
-    
+    int idx;
+
     // Start with a clean request
     request = calloc (1, sizeof (AFB_request));
     char *urlcpy1, *urlcpy2;
@@ -341,9 +345,10 @@ STATIC AFB_request *createRequest (struct MHD_Connection *connection, AFB_sessio
     request->connection = connection;
     request->config = session->config;
     request->url    = url;
-    request->plugin = strdup (baseurl);
+    request->prefix = strdup (baseurl);
     request->api    = strdup (baseapi);
     request->plugins= session->plugins;
+    // note request->handle is fed with request->context in ctxClientGet
 
 Done:    
     free(urlcpy1);
@@ -570,59 +575,105 @@ STATIC AFB_plugin ** RegisterJsonPlugins(AFB_plugin **plugins) {
     return (plugins);
 }
 
-void initPlugins(AFB_session *session) {
-    static AFB_plugin **plugins;
-    AFB_plugin* (*pluginRegisterFct)(void);
-    void *plugin;
-    char *pluginPath;
-    struct dirent *pluginDir;
+STATIC void scanDirectory(char *dirpath, int dirfd, AFB_plugin **plugins, int *count) {
     DIR *dir;
-    afbJsonType = json_object_new_string (AFB_MSG_JTYPE);
-    int num = 0;
-
-    /* pre-allocate for 20 plugins, we will downsize if necessary */
-    plugins = (AFB_plugin **) malloc (20*sizeof(AFB_plugin));
-
-    if ((dir = opendir(session->config->plugins)) == NULL) {
-        fprintf(stderr, "Could not open plugin directory [%s], exiting...\n", session->config->plugins);
-        exit (-1);
+    void *libso;
+    struct dirent *pluginDir;  
+    AFB_plugin* (*pluginRegisterFct)(void);
+    char pluginPath[255];   
+    
+    // Open Directory to scan over it
+    dir = fdopendir (dirfd);
+    if (dir == NULL) {
+        fprintf(stderr, "ERROR in scanning directory\n");
+        return; 
     }
+    if (verbose) fprintf (stderr, "Scanning dir=[%s] for plugins\n", dirpath);
 
     while ((pluginDir = readdir(dir)) != NULL) {
+        
+        // Loop on any contained directory
+        if ((pluginDir->d_type == DT_DIR) && (pluginDir->d_name[0] != '.')) {
+           int fd = openat (dirfd, pluginDir->d_name, O_DIRECTORY);
+           char newpath[255];
+           strncpy (newpath, dirpath, sizeof(newpath));
+           strncat (newpath, "/", sizeof(newpath));
+           strncat (newpath, pluginDir->d_name, sizeof(newpath));
+           
+           scanDirectory (newpath, fd, plugins, count);
+           close (fd);
+           
+        } else {
+            
+            // This is a file but not a plugin let's move to next directory element
+            if (!strstr (pluginDir->d_name, ".so")) continue;
 
-        if (!strstr (pluginDir->d_name, ".so"))
-            continue;
+            // This is a loadable library let's check if it's a plugin
+            snprintf (pluginPath, sizeof(pluginPath), "%s/%s", dirpath, pluginDir->d_name);
+            libso = dlopen (pluginPath, RTLD_NOW | RTLD_LOCAL);
 
-        asprintf (&pluginPath, "%s/%s", session->config->plugins, pluginDir->d_name);
-        plugin = dlopen (pluginPath, RTLD_NOW | RTLD_LOCAL);
-        pluginRegisterFct = dlsym (plugin, "pluginRegister");
-        free (pluginPath);
-        if (!plugin) {
-            if (verbose) fprintf(stderr, "[%s] is not loadable, continuing...\n", pluginDir->d_name);
-            continue;
-        } else if (!pluginRegisterFct) {
-            if (verbose) fprintf(stderr, "[%s] is not an AFB plugin, continuing...\n", pluginDir->d_name);
-            continue;
-        }
+            // Load fail we ignore this .so file            
+            if (!libso) {
+                fprintf(stderr, "[%s] is not loadable, continuing...\n", pluginDir->d_name);
+                continue;
+            }
+            
+            pluginRegisterFct = dlsym (libso, "pluginRegister");
+            free (libso);
+            
+            if (!pluginRegisterFct) {
+                fprintf(stderr, "[%s] is not an AFB plugin, continuing...\n", pluginDir->d_name);
+                continue;
+            }
 
-        if (verbose) fprintf(stderr, "[%s] is a valid AFB plugin, loading it\n", pluginDir->d_name);
-        plugins[num] = (AFB_plugin *) malloc (sizeof(AFB_plugin));
-        plugins[num] = (**pluginRegisterFct)();
-        num++;
-        /* only 20 plugins are supported at that time */
-        if (num == 20) break;
-    }
-    plugins = (AFB_plugin **) realloc (plugins, (num+1)*sizeof(AFB_plugin));
-    plugins[num] = NULL;
+            // if max plugin is reached let's stop searching
+            if (*count == AFB_MAX_PLUGINS) {
+                fprintf(stderr, "[%s] is not loaded [Max Count=%d reached]\n", *count);
+                continue;
+            }
 
+            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;
+            
+        }
+    }
     closedir (dir);
+}
+
+void initPlugins(AFB_session *session) {
+    static AFB_plugin **plugins;
+    
+    afbJsonType = json_object_new_string (AFB_MSG_JTYPE);
+    int count = 0;
+    char *dirpath;
+    int dirfd;
+
+    /* pre-allocate for AFB_MAX_PLUGINS plugins, we will downsize later */
+    plugins = (AFB_plugin **) malloc (AFB_MAX_PLUGINS *sizeof(AFB_plugin));
+    
+    // Loop on every directory passed in --plugins=xxx
+    while (dirpath = strsep(&session->config->ldpaths, ":")) {
+            // Ignore any directory we fail to open
+        if ((dirfd = open(dirpath, O_DIRECTORY)) <= 0) {
+            fprintf(stderr, "Invalid directory path=[%s]\n", dirpath);
+            continue;
+        }
+        scanDirectory (dirpath, dirfd, plugins, &count);
+        close (dirfd);
+    }
 
-    if (plugins[0] == NULL) {
+    if (count == 0) {
         fprintf(stderr, "No plugins found, afb-daemon is unlikely to work in this configuration, exiting...\n");
         exit (-1);
     }
+    
+    // downsize structure to effective number of loaded plugins
+    plugins = (AFB_plugin **)realloc (plugins, (count+1)*sizeof(AFB_plugin));
+    plugins[count] = NULL;
 
     // complete plugins and save them within current sessions    
     session->plugins = RegisterJsonPlugins(plugins);
-    session->config->pluginCount = num;
+    session->config->pluginCount = count;
 }