X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Flocal-def.h;h=2deb8c043060c12eb8e83cb9a2449a0a6d2d35ab;hb=c2560bd51498fb38e645b60ae638e2e888c74b65;hp=8f297c53e2b9639f50a23cd61a9acf7aff48ba0a;hpb=e76dff6729fb9acd1638019507e7edbbd8af23f5;p=src%2Fapp-framework-binder.git
diff --git a/include/local-def.h b/include/local-def.h
index 8f297c53..2deb8c04 100644
--- a/include/local-def.h
+++ b/include/local-def.h
@@ -1,5 +1,5 @@
/*
- alsajson-gw -- provide a REST/HTTP interface to ALSA-Mixer
+ local-def.h -- provide a REST/HTTP interface
Copyright (C) 2015, Fulup Ar Foll
@@ -54,7 +54,7 @@
#define MAGIC_DB "/usr/share/misc/magic.mgc"
#define OPA_INDEX "index.html"
#define MAX_ALIAS 10 // max number of aliases
-#define COOKIE_NAME "AJB_session"
+#define COOKIE_NAME "afb-session"
#define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection Timeout
@@ -63,6 +63,7 @@
#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
+#define AFB_MAX_PLUGINS 20 // Max number of plugins for a given binder
typedef int BOOL;
#ifndef FALSE
@@ -87,7 +88,7 @@ typedef enum {AFB_PLUGIN_JSON=123456789, AFB_PLUGIN_JSCRIPT=987654321, AFB_PLU
typedef enum { AFB_FALSE, AFB_TRUE, AFB_FATAL, AFB_FAIL, AFB_WARNING, AFB_EMPTY, AFB_SUCCESS, AFB_DONE, AFB_UNAUTH} AFB_error;
extern char *ERROR_LABEL[];
-#define ERROR_LABEL_DEF {"false", "true","fatal", "fail", "warning", "empty", "success"}
+#define ERROR_LABEL_DEF {"false", "true", "fatal", "fail", "warning", "empty", "success"}
#define BANNER "
Application Framework BinderApplication Framework "
#define JSON_CONTENT "application/json"
@@ -97,6 +98,7 @@ extern char *ERROR_LABEL[];
typedef json_object* (*AFB_apiCB)();
+typedef void (*AFB_freeCtxCB)(void*, void*, char*);
// Error code are requested through function to manage json usage count
typedef struct {
@@ -105,13 +107,15 @@ typedef struct {
json_object *json;
} AFB_errorT;
-typedef enum {AFB_POST_NONE=0, AFB_POST_JSON, AFB_POST_FORM} AFB_PostType;
+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;
- json_object* jerror;
+ int errcode;
+ json_object* jresp;
} AFB_PostCtx;
typedef struct {
@@ -127,7 +131,7 @@ typedef struct {
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
+ char *privatebuf; // use internally to keep track or partial buffer
struct MHD_PostProcessor *pp; // iterator handle
} AFB_PostHandle;
@@ -167,8 +171,7 @@ typedef struct {
char *console; // console device name (can be a file or a tty)
int localhostOnly;
int httpdPort;
- char *smack; // smack label
- char *plugins; // list of requested plugins
+ char *ldpaths; // list of plugins directories
char *rootdir; // base dir for httpd file download
char *rootbase; // Angular HTML5 base URL
char *rootapi; // Base URL for REST APIs
@@ -180,15 +183,11 @@ 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;
-typedef struct {
- int len; // command number within application
- json_object *jtype;
-} AFB_privateApi;
-
-
typedef struct {
char *msg;
size_t len;
@@ -203,7 +202,6 @@ typedef struct {
AFB_sessionE session;
AFB_apiCB callback;
char *info;
- AFB_privateApi *private;
} AFB_restapi;
// Plugin definition
@@ -216,31 +214,32 @@ typedef struct {
AFB_restapi *apis;
void *handle;
int ctxCount;
- AFB_apiCB freeCtxCB; // callback to free application context [null for standard free]
+ AFB_freeCtxCB 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 *ctx; // application specific context
- AFB_plugin *plugin; // provide callback and easy access to plugin
+ void **contexts; // application specific context [one per plugin]]
+ AFB_plugin **plugins; // we need plugins reference to cleanup session outside of call context
} AFB_clientCtx;
// MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "value");
typedef struct {
+ const char *uuid;
const char *url;
- char *plugin;
+ char *prefix; // plugin convivial name
char *api;
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]
- int errcode; // http error code
+ 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;
@@ -259,6 +258,7 @@ typedef struct {
void *httpd; // anonymous structure for httpd handler
int fakemod; // respond to GET/POST request without interacting with sndboard
int forceexit; // when autoconfig from script force exit before starting server
+ 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
sigjmp_buf restartCkpt; // context save for restart set/longjmp