simplifications

[src/app-framework-binder.git] / src / local-def.h

diff --git a/src/local-def.h b/src/local-def.h
index f46dd97..1992b51 100644 (file)
--- a/src/local-def.h
+++ b/src/local-def.h
@@ -22,108 +22,23 @@
 #define LOCAL_DEF_H
 
 #include <json.h>
-#include <magic.h>
 #include <microhttpd.h>
 
 /* other definitions --------------------------------------------------- */
 
 // Note: because of a bug in libmagic MAGIC_DB NULL should not be used for default
-#define OPA_INDEX "index.html"
 #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
 #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
 
-#ifndef FALSE
-  #define FALSE 0
-#endif
-#ifndef TRUE
-  #define TRUE 1
-#endif
-
-#define PUBLIC
-#define STATIC    static
-#define FAILED    -1
-
-#define AUDIO_BUFFER "/tmp/buf"
-
-extern int verbose;  // this is the only global variable
-
-// 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;
-
-#define MAX_POST_SIZE  4096   // maximum size for POST data
 #define CTX_NBCLIENTS   10   // allow a default of 10 authenticated clients
 
 
-
-
-
-
-
-
-// Plugin Type
-enum  AFB_pluginE
-{
-       AFB_PLUGIN_JSON = 123456789,
-       AFB_PLUGIN_JSCRIPT = 987654321,
-       AFB_PLUGIN_RAW = 987123546
-};
-
-// Enum for Session/Token/Authentication middleware
-enum AFB_sessionE
-{
-       AFB_SESSION_NONE,
-       AFB_SESSION_CREATE,
-       AFB_SESSION_CLOSE,
-       AFB_SESSION_RENEW,
-       AFB_SESSION_CHECK
-};
-
-// API definition
-struct AFB_restapi
-{
-       const char *name;
-       enum AFB_sessionE session;
-       struct json_object* (*callback)();
-       const char *info;
-};
-
-// Plugin definition
-struct AFB_plugin
-{
-       enum AFB_pluginE type;  
-       const char *info;
-       const char *prefix;
-       const struct AFB_restapi *apis;
-       void (*freeCtxCB)(void*);  // callback to free application context [null for standard free]
-};
-
-typedef enum AFB_pluginE AFB_pluginE;
-typedef enum AFB_sessionE AFB_sessionE;
-typedef struct json_object* (*AFB_apiCB)();
-typedef void (*AFB_freeCtxCB)(void*);
-typedef struct AFB_restapi AFB_restapi;
-typedef struct AFB_plugin AFB_plugin;
-
-
-
-
-
-
-
-
-
-
-typedef enum  {AFB_MODE_LOCAL=0, AFB_MODE_REMOTE, AFB_MODE_GLOBAL} AFB_Mode;
-
-
 typedef struct {
   char  *url;
   char  *path;
@@ -144,27 +59,11 @@ struct AFB_config
   int  cacheTimeout;
   int  apiTimeout;
   int  cntxTimeout;        // Client Session Context timeout
-  AFB_Mode mode;           // mode of listening
+  int mode;           // mode of listening
   AFB_aliasdir *aliasdir;  // alias mapping for icons,apps,...
 };
 
-// MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "value");
-typedef struct {
-  const char *uuid;
-  const char *url;
-  const char *prefix;              // plugin convivial name
-  const char *method;
-/*
-  AFB_PostRequest *post;
-*/
-  struct json_object *jresp;
-  void *context;             // Hold Client Context when using session
-  int  restfull;             // request is resfull [uuid token provided]
-  int  errcode;              // http error code
-  struct AFB_config *config;         // plugin may need access to config
-  struct afb_req *areq;
-} AFB_request;
-
+struct afb_hsrv;
 struct afb_hsrv_handler;
 struct MHD_Daemon;
 
@@ -173,19 +72,12 @@ struct AFB_session
   struct AFB_config  *config;   // pointer to current config
   // List of commands to execute
   int  background;        // run in backround mode
-  int  foreground;        // run in forground mode
-  char *cacheTimeout;     // http require timeout to be a string
-  struct MHD_Daemon *httpd;            // structure for httpd handler
-  int  fakemod;           // respond to GET/POST request without interacting with sndboard
   int  readyfd;           // a #fd to signal when ready to serve
-  magic_t  magic;         // Mime type file magic lib
-  struct afb_hsrv_handler *handlers;
+  struct afb_hsrv *hsrv;
 };
 
 
 typedef struct AFB_config AFB_config;
 typedef struct AFB_session AFB_session;
 
-#include "proto-def.h"
-
 #endif /* LOCAL_DEF_H */