X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Flocal-def.h;h=cbbef0f96d976e59000fbbbd5401fa62bc424a8c;hb=662faf40f0c11536afcaa7e2ff0969f247ae4965;hp=b37cd757a4c59022de17e663b4263a397f1224b6;hpb=37c1f71d519420addb71c6137e551ecb51336f7c;p=src%2Fapp-framework-binder.git
diff --git a/include/local-def.h b/include/local-def.h
index b37cd757..cbbef0f9 100644
--- a/include/local-def.h
+++ b/include/local-def.h
@@ -60,6 +60,7 @@
#define DEFLT_API_TIMEOUT 0 // default Plugin API Timeout
#define DEFLT_CACHE_TIMEOUT 100000 // default Static File Chache [Client Side Cache 100000~=1day]
#define DEFLT_AUTH_TOKEN NULL // expect for debug should == NULL
+#define DEFLT_HTTP_TIMEOUT 15 // Max MibMicroHttp timeout
typedef int BOOL;
#ifndef FALSE
@@ -75,9 +76,8 @@ typedef int BOOL;
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_pluginT;
+typedef enum {AFB_PLUGIN_JSON=123456789, AFB_PLUGIN_JSCRIPT=987654321, AFB_PLUGIN_RAW=987123546} AFB_pluginE;
// prebuild json error are constructed in config.c
typedef enum { AFB_FALSE, AFB_TRUE, AFB_FATAL, AFB_FAIL, AFB_WARNING, AFB_EMPTY, AFB_SUCCESS, AFB_DONE, AFB_UNAUTH} AFB_error;
@@ -87,6 +87,7 @@ extern char *ERROR_LABEL[];
#define BANNER "
Application Framework BinderApplication Framework "
#define JSON_CONTENT "application/json"
+#define FORM_CONTENT "multipart/form-data"
#define MAX_POST_SIZE 4096 // maximum size for POST data
#define CTX_NBCLIENTS 10 // allow a default of 10 authenticated clients
@@ -100,12 +101,35 @@ typedef struct {
json_object *json;
} AFB_errorT;
+typedef enum {AFB_POST_NONE=0, AFB_POST_JSON, AFB_POST_FORM} AFB_PostType;
+
+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 {
- char* data;
- int len;
- int uid;
-} AFB_HttpPost;
+ 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 *private; // 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];
@@ -148,8 +172,6 @@ typedef struct {
AFB_aliasdir *aliasdir; // alias mapping for icons,apps,...
} AFB_config;
-
-
typedef struct {
int len; // command number within application
json_object *jtype;
@@ -161,34 +183,49 @@ typedef struct {
size_t len;
} AFB_redirect_msg;
+// 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;
+
// API definition
typedef struct {
char *name;
+ AFB_sessionE session;
AFB_apiCB callback;
char *info;
AFB_privateApi *private;
} AFB_restapi;
+// Plugin definition
+typedef struct {
+ AFB_pluginE type;
+ char *info;
+ char *prefix;
+ size_t prefixlen;
+ json_object *jtype;
+ AFB_restapi *apis;
+ void *handle;
+ int ctxCount;
+ AFB_apiCB freeCtxCB; // callback to free application context [null for standard free]
+} AFB_plugin;
+
// User Client Session Context
typedef struct {
- int cid; // index 0 if global
- 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 *handle; // application specific context
- AFB_apiCB freeHandleCB; // callback to free application handle [null for standard free]
+ int cid; // index 0 if global
+ 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 *ctx; // application specific context
+ AFB_plugin *plugin; // provide callback and easy access to plugin
} AFB_clientCtx;
-
// MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "value");
typedef struct {
const char *url;
char *plugin;
char *api;
- char *post;
- int loa;
+ AFB_PostRequest *post;
json_object *jresp;
AFB_clientCtx *client; // needed because libmicrohttp cannot create an empty response
int restfull; // request is resfull [uuid token provided]
@@ -196,29 +233,16 @@ typedef struct {
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;
} AFB_request;
-// Plugin definition
-typedef struct {
- AFB_pluginT type;
- char *info;
- char *prefix;
- size_t prefixlen;
- json_object *jtype;
- AFB_restapi *apis;
- void *handle;
- int ctxCount;
-} AFB_plugin;
-
-
typedef struct {
AFB_config *config; // pointer to current config
// List of commands to execute
int killPrevious;
int background; // run in backround mode
int foreground; // run in forground mode
- int checkAlsa; // Display active Alsa Board
int configsave; // Save config on disk on start
char *cacheTimeout; // http require timeout to be a string
void *httpd; // anonymous structure for httpd handler