diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2016-02-17 14:41:07 +0100 |
|---|---|---|
| committer | Fulup Ar Foll <fulup@iot.bzh> | 2016-02-17 14:41:07 +0100 |
| commit | 3da6e9fad4c6788098cf425369fb3d7860cb824f (patch) | |
| tree | 95751052d331a35162c242a4c2d2f177a9b7ada0 /include/local-def.h | |
| parent | 6d0846d769256e74a3f403fc0e5965e2d227b324 (diff) | |
| parent | fcfb3c0951b6e2e06e7bf282e867576d8abb00c4 (diff) | |
Merge origin/master
Diffstat (limited to 'include/local-def.h')
| -rw-r--r-- | include/local-def.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/local-def.h b/include/local-def.h index 6d219406..01f10626 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 @@ -88,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 "<html><head><title>Application Framework Binder</title></head><body>Application Framework </body></html>" #define JSON_CONTENT "application/json" @@ -108,6 +108,7 @@ typedef struct { } 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; // Post Upload File Handle typedef struct { @@ -130,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; @@ -170,7 +171,6 @@ typedef struct { char *console; // console device name (can be a file or a tty) int localhostOnly; int httpdPort; - char *smack; // smack label char *ldpaths; // list of plugins directories char *rootdir; // base dir for httpd file download char *rootbase; // Angular HTML5 base URL @@ -184,6 +184,7 @@ typedef struct { 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; @@ -207,7 +208,7 @@ typedef struct { AFB_sessionE session; AFB_apiCB callback; char *info; - AFB_privateApi *private; + AFB_privateApi *privateapi; } AFB_restapi; // Plugin definition @@ -264,6 +265,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 |