X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Flocal-def.h;h=280ab0bb51a3b0b659852ffd04b86eaffb1b9efe;hb=8ca3d16606a99ef91d01a623dbe5ce1331688953;hp=735a34b8cceea740b41ed34194ac02839ec2c697;hpb=7aae8b046213dc7041e741b5e8b2757255701183;p=src%2Fapp-framework-binder.git diff --git a/include/local-def.h b/include/local-def.h index 735a34b8..280ab0bb 100644 --- a/include/local-def.h +++ b/include/local-def.h @@ -52,7 +52,6 @@ #define MAX_ALIAS 10 // max number of aliases #define COOKIE_NAME "afb-session" - #define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection Timeout #define DEFLT_API_TIMEOUT 0 // default Plugin API Timeout [0=NoLimit for Debug Only] #define DEFLT_API_TIMEOUT 0 // default Plugin API Timeout @@ -61,7 +60,6 @@ #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 #define FALSE 0 #endif @@ -80,15 +78,9 @@ 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; -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" #define MAX_POST_SIZE 4096 // maximum size for POST data #define CTX_NBCLIENTS 10 // allow a default of 10 authenticated clients @@ -96,13 +88,6 @@ 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 { - int level; - char* label; - json_object *json; -} AFB_errorT; - 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; @@ -153,29 +138,6 @@ typedef struct { size_t len; } AFB_aliasdir; -// 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 *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 { char *msg; size_t len; @@ -216,6 +178,24 @@ typedef struct { AFB_plugin **plugins; // we need plugins reference to cleanup session outside of call context } AFB_clientCtx; +// main config structure +typedef struct { + char *console; // console device name (can be a file or a tty) + int httpdPort; + 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 *sessiondir; // where to store mixer session files + 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; + // MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "value"); typedef struct { const char *uuid; @@ -234,25 +214,21 @@ typedef struct { AFB_plugin **plugins; } AFB_request; -struct afb_req_handler; -struct afb_req; +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 - struct MHD_Daemon *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 - struct afb_req_handler *handlers; - sigjmp_buf restartCkpt; // context save for restart set/longjmp + struct afb_hsrv_handler *handlers; } AFB_session;