X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=include%2Flocal-def.h;h=a55326f1de669f1be1f43989d2694be4f7fdb757;hb=fe79c7ba875a9203020e72e82fa3524fd2fb74d2;hp=9c58441767c9bb982dabc8e65b4e88679814dd86;hpb=5d293eac235f2d59eccc9b23de803821b821c12e;p=src%2Fapp-framework-binder.git
diff --git a/include/local-def.h b/include/local-def.h
index 9c584417..a55326f1 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
@@ -45,16 +45,12 @@
-
-#define AJQ_VERSION "0.1"
-
/* other definitions --------------------------------------------------- */
// Note: because of a bug in libmagic MAGIC_DB NULL should not be used for default
-#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 +59,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
@@ -86,9 +83,6 @@ typedef enum {AFB_PLUGIN_JSON=123456789, AFB_PLUGIN_JSCRIPT=987654321, AFB_PLU
// 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;
-extern char *ERROR_LABEL[];
-#define ERROR_LABEL_DEF {"false", "true","fatal", "fail", "warning", "empty", "success"}
-
#define BANNER "
Application Framework BinderApplication Framework "
#define JSON_CONTENT "application/json"
#define FORM_CONTENT "multipart/form-data"
@@ -97,16 +91,10 @@ extern char *ERROR_LABEL[];
typedef json_object* (*AFB_apiCB)();
-typedef void (*AFB_freeCtxCB)(void*, char*);
+typedef void (*AFB_freeCtxCB)(void*, void*, char*);
-// Error code are requested through function to manage json usage count
-typedef struct {
- int level;
- char* label;
- 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 {
@@ -129,7 +117,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;
@@ -155,43 +143,26 @@ typedef struct {
size_t len;
} AFB_aliasdir;
-// Command line structure hold cli --command + help text
-typedef struct {
- int val; // command number within application
- int has_arg; // command number within application
- char *name; // command as used in --xxxx cli
- char *help; // help text
-} AFB_options;
-
// main config structure
typedef struct {
char *logname; // logfile path for info & error log
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
- char *pidfile; // where to store pid when running background
char *sessiondir; // where to store mixer session files
- char *configfile; // where to store configuration on gateway exit
- char *setuid; // downgrade uid to username
char *token; // initial authentication token [default NULL no session]
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;
@@ -206,7 +177,6 @@ typedef struct {
AFB_sessionE session;
AFB_apiCB callback;
char *info;
- AFB_privateApi *private;
} AFB_restapi;
// Plugin definition
@@ -237,11 +207,12 @@ typedef struct {
typedef struct {
const char *uuid;
const char *url;
- char *plugin;
+ char *prefix; // plugin convivial name
char *api;
AFB_PostRequest *post;
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
@@ -250,21 +221,20 @@ typedef struct {
AFB_plugin **plugins;
} AFB_request;
-
+struct afb_hsrv_handler;
+struct MHD_Daemon;
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 configsave; // Save config on disk on start
char *cacheTimeout; // http require timeout to be a string
- void *httpd; // anonymous structure for httpd handler
+ struct MHD_Daemon *httpd; // 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
+ struct afb_hsrv_handler *handlers;
} AFB_session;