X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=include%2Flocal-def.h;h=735a34b8cceea740b41ed34194ac02839ec2c697;hb=3a10185ae380956bd356c73f34138f97255bf7e6;hp=0bf0294d2d7cbd81ff2fbffb28c0f64f9819a942;hpb=6930cdc6c322f88d1f3cc99622941e3d5037f74a;p=src%2Fapp-framework-binder.git

diff --git a/include/local-def.h b/include/local-def.h
index 0bf0294d..735a34b8 100644
--- a/include/local-def.h
+++ b/include/local-def.h
@@ -45,13 +45,9 @@
 
 
 
-
-#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   "afb-session"
@@ -157,14 +153,6 @@ 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
@@ -188,12 +176,6 @@ typedef struct {
   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;
@@ -208,7 +190,6 @@ typedef struct {
   AFB_sessionE session;
   AFB_apiCB callback;
   char *info;
-  AFB_privateApi *privateapi;
 } AFB_restapi;
 
 // Plugin definition
@@ -253,7 +234,9 @@ typedef struct {
   AFB_plugin **plugins;
 } AFB_request;
 
-
+struct afb_req_handler;
+struct afb_req;
+struct MHD_Daemon;
 typedef struct {
   AFB_config  *config;   // pointer to current config
   // List of commands to execute
@@ -262,12 +245,13 @@ typedef struct {
   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;            // 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
+  struct afb_req_handler *handlers;
   sigjmp_buf restartCkpt; // context save for restart set/longjmp
 } AFB_session;