X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Flocal-def.h;h=f46dd97c464e93d182df35585b4c2351ce30beb7;hb=dde70b62b09f49ad672c104a3f81714bf11047be;hp=48437d91b1ebbe894a81a668629cb6aae5e7e4fe;hpb=5ffc5b65e3f2388d518d0e75afb7788f7d5fa041;p=src%2Fapp-framework-binder.git

diff --git a/include/local-def.h b/include/local-def.h
index 48437d91..f46dd97c 100644
--- a/include/local-def.h
+++ b/include/local-def.h
@@ -21,29 +21,9 @@
 #ifndef LOCAL_DEF_H
 #define LOCAL_DEF_H
 
-#ifndef _GNU_SOURCE
-  #define _GNU_SOURCE
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/signal.h>
-#include <sys/types.h>
-#include <time.h>
 #include <json.h>
-#include <microhttpd.h>
 #include <magic.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <uuid/uuid.h>
-
-
+#include <microhttpd.h>
 
 /* other definitions --------------------------------------------------- */
 
@@ -75,111 +55,84 @@
 
 extern int verbose;  // this is the only global variable
 
-// Plugin Type
-typedef enum  {AFB_PLUGIN_JSON=123456789, AFB_PLUGIN_JSCRIPT=987654321,  AFB_PLUGIN_RAW=987123546} AFB_pluginE;
-
-// prebuild json error are constructed in config.c
+// prebuild json error are constructed in helper-api.c
 typedef enum  { AFB_FALSE, AFB_TRUE, AFB_FATAL, AFB_FAIL, AFB_WARNING, AFB_EMPTY, AFB_SUCCESS, AFB_DONE, AFB_UNAUTH} AFB_error;
 
 #define MAX_POST_SIZE  4096   // maximum size for POST data
 #define CTX_NBCLIENTS   10   // allow a default of 10 authenticated clients
 
 
-typedef json_object* (*AFB_apiCB)();
-typedef void (*AFB_freeCtxCB)(void*, void*, char*);
 
-typedef enum  {AFB_POST_NONE=0, AFB_POST_JSON, AFB_POST_FORM, AFB_POST_EMPTY} AFB_PostType;
-typedef enum  {AFB_MODE_LOCAL=0, AFB_MODE_REMOTE, AFB_MODE_GLOBAL} AFB_Mode;
 
-// Post Upload File Handle
-typedef struct {
-   int   fd; 
-   char *path; 
-   int  errcode;
-   json_object* jresp;
-} AFB_PostCtx;
-
-typedef  struct {
-    int  len;   // post element size
-    char *data; // post data in raw format
-    AFB_PostType type; // Json type
-} AFB_PostRequest;
-  
-// Post handler
-typedef struct {
-  void*  ctx;               // Application context
-  int    len;               // current len for post
-  int    uid;               // post uid for debug
-  AFB_PostType type;        // JSON or FORM
-  AFB_apiCB  completeCB;    // callback when post is completed
-  char   *privatebuf;       // use internally to keep track or partial buffer
-  struct MHD_PostProcessor *pp; // iterator handle
-} AFB_PostHandle;
 
-typedef struct {
-    enum MHD_ValueKind kind; // kind type of the value
-    const char *key;         // key 0-terminated key for the value
-    const char *filename;    // filename of the uploaded file, NULL if not known
-    const char *mimetype;    // content_type mime-type of the data, NULL if not known
-    const char *encoding;    // transfer_encoding encoding of the data, NULL if not known
-    const char *data;        // data pointer to size bytes of data at the specified offset
-    uint64_t   offset;       // offset of data in the overall value
-    size_t     len;          // number of bytes in data available
-} AFB_PostItem;
 
-typedef struct {
-  char  path[512];
-  int   fd;
-} AFB_staticfile;
 
-typedef struct {
-  char  *url;
-  char  *path;
-  size_t len;
-} AFB_aliasdir;
 
-typedef struct {
-     char    *msg;
-     size_t  len;
-} AFB_redirect_msg;
+// Plugin Type
+enum  AFB_pluginE
+{
+	AFB_PLUGIN_JSON = 123456789,
+	AFB_PLUGIN_JSCRIPT = 987654321,
+	AFB_PLUGIN_RAW = 987123546
+};
 
 // Enum for Session/Token/Authentication middleware
-typedef enum  {AFB_SESSION_NONE, AFB_SESSION_CREATE, AFB_SESSION_CLOSE, AFB_SESSION_RENEW, AFB_SESSION_CHECK} AFB_sessionE;
+enum AFB_sessionE
+{
+	AFB_SESSION_NONE,
+	AFB_SESSION_CREATE,
+	AFB_SESSION_CLOSE,
+	AFB_SESSION_RENEW,
+	AFB_SESSION_CHECK
+};
 
 // API definition
-typedef struct {
-  char *name;
-  AFB_sessionE session;
-  AFB_apiCB callback;
-  char *info;
-} AFB_restapi;
+struct AFB_restapi
+{
+	const char *name;
+	enum AFB_sessionE session;
+	struct json_object* (*callback)();
+	const char *info;
+};
 
 // Plugin definition
+struct AFB_plugin
+{
+	enum AFB_pluginE type;  
+	const char *info;
+	const char *prefix;
+	const struct AFB_restapi *apis;
+	void (*freeCtxCB)(void*);  // callback to free application context [null for standard free]
+};
+
+typedef enum AFB_pluginE AFB_pluginE;
+typedef enum AFB_sessionE AFB_sessionE;
+typedef struct json_object* (*AFB_apiCB)();
+typedef void (*AFB_freeCtxCB)(void*);
+typedef struct AFB_restapi AFB_restapi;
+typedef struct AFB_plugin AFB_plugin;
+
+
+
+
+
+
+
+
+
+
+typedef enum  {AFB_MODE_LOCAL=0, AFB_MODE_REMOTE, AFB_MODE_GLOBAL} AFB_Mode;
+
+
 typedef struct {
-  AFB_pluginE type;  
-  char *info;
-  char *prefix;
-  size_t prefixlen;
-  json_object *jtype;
-  AFB_restapi *apis;
-  void *handle;
-  int  ctxCount;
-  AFB_freeCtxCB freeCtxCB;  // callback to free application context [null for standard free]
-} AFB_plugin;
-
-
-// User Client Session Context
-typedef struct {
-  char uuid[37];        // long term authentication of remote client
-  char token[37];       // short term authentication of remote client
-  time_t timeStamp;     // last time token was refresh
-  int   restfull;       // client does not use cookie
-  void **contexts;      // application specific context [one per plugin]]
-  AFB_plugin **plugins; // we need plugins reference to cleanup session outside of call context
-} AFB_clientCtx;
+  char  *url;
+  char  *path;
+  size_t len;
+} AFB_aliasdir;
 
 // main config structure
-typedef struct {
+struct AFB_config
+{
   char *console;           // console device name (can be a file or a tty)
   int   httpdPort;
   char *ldpaths;           // list of plugins directories
@@ -191,34 +144,33 @@ typedef struct {
   int  cacheTimeout;
   int  apiTimeout;
   int  cntxTimeout;        // Client Session Context timeout
-  int  pluginCount;        // loaded plugins count
   AFB_Mode mode;           // mode of listening
   AFB_aliasdir *aliasdir;  // alias mapping for icons,apps,...
-} AFB_config;
+};
 
 // MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "value");
 typedef struct {
   const char *uuid;
   const char *url;
-  char *prefix;              // plugin convivial name
-  char *api;
+  const char *prefix;              // plugin convivial name
+  const char *method;
+/*
   AFB_PostRequest *post;
-  json_object *jresp;
+*/
+  struct json_object *jresp;
   void *context;             // Hold Client Context when using session
-  void *handle;              // provide callback and easy access to plugin
   int  restfull;             // request is resfull [uuid token provided]
   int  errcode;              // http error code
-  sigjmp_buf checkPluginCall; // context save for timeout set/longjmp
-  AFB_config *config;         // plugin may need access to config
-  struct MHD_Connection *connection;
-  AFB_plugin **plugins;
+  struct AFB_config *config;         // plugin may need access to config
+  struct afb_req *areq;
 } AFB_request;
 
 struct afb_hsrv_handler;
 struct MHD_Daemon;
 
-typedef struct {
-  AFB_config  *config;   // pointer to current config
+struct AFB_session
+{
+  struct AFB_config  *config;   // pointer to current config
   // List of commands to execute
   int  background;        // run in backround mode
   int  foreground;        // run in forground mode
@@ -226,12 +178,13 @@ typedef struct {
   struct MHD_Daemon *httpd;            // structure for httpd handler
   int  fakemod;           // respond to GET/POST request without interacting with sndboard
   int  readyfd;           // a #fd to signal when ready to serve
-  AFB_plugin **plugins;   // pointer to REST/API plugins 
   magic_t  magic;         // Mime type file magic lib
   struct afb_hsrv_handler *handlers;
-} AFB_session;
+};
 
 
+typedef struct AFB_config AFB_config;
+typedef struct AFB_session AFB_session;
 
 #include "proto-def.h"