X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=fcc69a418c0f9ad1383a49b144c28105c1342a3f;hb=refs%2Fheads%2Fsandbox%2FDDTLK%2Fpakage;hp=2a6f931f66f0aa7506351d4cfab7d8cfb2ca08e9;hpb=af06c82a63166d0d3fbdc26ae50607a6231d42eb;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index 2a6f931f..fcc69a41 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -23,14 +23,20 @@ #include #include #include +#include #include +#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE) +#define JSON_C_TO_STRING_NOSLASHESCAPE 0 +#endif #include "verbose.h" #include "afb-config.h" -#include "afb-hook.h" +#include "afb-hook-flags.h" +#include "wrap-json.h" -#include +#define _d2s_(x) #x +#define d2s(x) _d2s_(x) #if !defined(BINDING_INSTALL_DIR) #error "you should define BINDING_INSTALL_DIR" @@ -39,218 +45,283 @@ #error "you should define AFB_VERSION" #endif -/* set the HAS_ options */ -#if defined(WITH_MONITORING_OPTION) -# define HAS_MONITORING 1 -#else -# define HAS_MONITORING 0 -#endif -#if defined(WITH_DBUS_TRANSPARENCY) -# define HAS_DBUS 1 -#else -# define HAS_DBUS 0 -#endif +/** + * The default timeout of sessions in seconds + */ +#define DEFAULT_SESSION_TIMEOUT 32000000 -// default -#define DEFLT_CNTX_TIMEOUT 32000000 // default Client Connection - // Timeout: few more than one year -#define DEFLT_API_TIMEOUT 20 // default Plugin API Timeout [0=NoLimit - // for Debug Only] -#define DEFLT_CACHE_TIMEOUT 100000 // default Static File Chache - // [Client Side Cache - // 100000~=1day] -#define CTX_NBCLIENTS 10 // allow a default of 10 authenticated - // clients +/** + * The default timeout of api calls in seconds + */ +#define DEFAULT_API_TIMEOUT 20 +/** + * The default timeout of cache in seconds + */ +#define DEFAULT_CACHE_TIMEOUT 100000 -// Define command line option -#define SET_BACKGROUND 2 -#define SET_FORGROUND 3 +/** + * The default maximum count of sessions + */ +#define DEFAULT_MAX_SESSION_COUNT 200 -#define SET_ROOT_DIR 6 -#define SET_ROOT_BASE 7 -#define SET_ROOT_API 8 -#define SET_ALIAS 9 +/** + * The default HTTP port to serve + */ +#define DEFAULT_HTTP_PORT 1234 -#define SET_CACHE_TIMEOUT 10 -#define SET_SESSION_DIR 11 +// Define command line option +#define SET_BACKGROUND 1 +#define SET_FOREGROUND 2 +#define SET_ROOT_DIR 3 +#define SET_ROOT_BASE 4 +#define SET_ROOT_API 5 +#define ADD_ALIAS 6 -#define SET_LDPATH 13 -#define SET_APITIMEOUT 14 -#define SET_CNTXTIMEOUT 15 -#define SET_WEAK_LDPATH 16 -#define NO_LDPATH 17 +#define SET_CACHE_TIMEOUT 7 -#define SET_MODE 18 +#define AUTO_WS 8 +#define AUTO_LINK 9 -#if HAS_DBUS -# define DBUS_CLIENT 20 -# define DBUS_SERVICE 21 -#endif +#define ADD_LDPATH 10 +#define SET_API_TIMEOUT 11 +#define SET_SESSION_TIMEOUT 12 +#define ADD_WEAK_LDPATH 13 +#define SET_NO_LDPATH 14 -#define SO_BINDING 22 +#define SET_SESSIONMAX 15 -#define SET_SESSIONMAX 23 +#define ADD_WS_CLIENT 16 +#define ADD_WS_SERVICE 17 -#define WS_CLIENT 24 -#define WS_SERVICE 25 +#define SET_ROOT_HTTP 18 -#define SET_ROOT_HTTP 26 +#define SET_NO_HTTPD 19 -#define SET_NO_HTTPD 28 +#define SET_TRACEEVT 20 +#define SET_TRACESES 21 +#define SET_TRACEREQ 22 +#define SET_TRACEAPI 23 +#define SET_TRACEGLOB 24 +#if !defined(REMOVE_LEGACY_TRACE) +#define SET_TRACEDITF 25 +#define SET_TRACESVC 26 +#endif +#define SET_TRAP_FAULTS 27 +#define ADD_CALL 28 +#if defined(WITH_DBUS_TRANSPARENCY) +# define ADD_DBUS_CLIENT 30 +# define ADD_DBUS_SERVICE 31 +#endif -#define ADD_CALL 'c' -#define SET_TRACEDITF 'D' -#define SET_TRACEEVT 'E' +#define ADD_AUTO_API 'A' +#define ADD_BINDING 'b' +#define SET_CONFIG 'C' +#define SET_COLOR 'c' +#define SET_DAEMON 'D' #define SET_EXEC 'e' -#define DISPLAY_HELP 'h' -#if HAS_MONITORING -# define SET_MONITORING 'M' +#define GET_HELP 'h' +#define SET_LOG 'l' +#if defined(WITH_MONITORING_OPTION) +#define SET_MONITORING 'M' #endif #define SET_NAME 'n' -#define SET_TCP_PORT 'p' +#define SET_OUTPUT 'o' +#define SET_PORT 'p' #define SET_QUIET 'q' -#define SET_RNDTOKEN 'r' -#define SET_TRACESVC 'S' -#define SET_TRACESES 's' -#define SET_TRACEREQ 'T' -#define SET_AUTH_TOKEN 't' +#define SET_RANDOM_TOKEN 'r' +#define ADD_SET 's' +#define SET_TOKEN 't' #define SET_UPLOAD_DIR 'u' -#define DISPLAY_VERSION 'V' +#define GET_VERSION 'V' #define SET_VERBOSE 'v' #define SET_WORK_DIR 'w' +#define DUMP_CONFIG 'Z' + +/* structure for defining of options */ +struct option_desc { + int id; /* id of the option */ + int has_arg; /* is a value required */ + char *name; /* long name of the option */ + char *help; /* help text */ +}; -const char shortopts[] = - "c:D:E:ehn:p:qrS:s:T:t:u:Vvw:" -#if HAS_MONITORING - "M" -#endif -; - -// 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; - -// Supported option -static AFB_options cliOptions[] = { +/* definition of options */ +static struct option_desc optdefs[] = { /* *INDENT-OFF* */ - {SET_VERBOSE, 0, "verbose", "Verbose Mode, repeat to increase verbosity"}, - {SET_QUIET, 0, "quiet", "Quiet Mode, repeat to decrease verbosity"}, - - {SET_FORGROUND, 0, "foreground", "Get all in foreground mode"}, - {SET_BACKGROUND, 0, "daemon", "Get all in background mode"}, + {SET_VERBOSE, 0, "verbose", "Verbose Mode, repeat to increase verbosity"}, + {SET_COLOR, 0, "color", "Colorize the ouput"}, + {SET_QUIET, 0, "quiet", "Quiet Mode, repeat to decrease verbosity"}, + {SET_LOG, 1, "log", "Tune log level"}, - {SET_NAME, 1, "name", "Set the visible name"}, + {SET_FOREGROUND, 0, "foreground", "Get all in foreground mode"}, + {SET_BACKGROUND, 0, "background", "Get all in background mode"}, + {SET_DAEMON, 0, "daemon", "Get all in background mode"}, - {SET_TCP_PORT, 1, "port", "HTTP listening TCP port [default 1234]"}, - {SET_ROOT_HTTP, 1, "roothttp", "HTTP Root Directory [default no root http (files not served but apis still available)]"}, - {SET_ROOT_BASE, 1, "rootbase", "Angular Base Root URL [default /opa]"}, - {SET_ROOT_API, 1, "rootapi", "HTML Root API URL [default /api]"}, - {SET_ALIAS, 1, "alias", "Multiple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, + {SET_NAME, 1, "name", "Set the visible name"}, - {SET_APITIMEOUT, 1, "apitimeout", "Binding API timeout in seconds [default 10]"}, - {SET_CNTXTIMEOUT, 1, "cntxtimeout", "Client Session Context Timeout [default 900]"}, - {SET_CACHE_TIMEOUT, 1, "cache-eol", "Client cache end of live [default 3600]"}, + {SET_PORT, 1, "port", "HTTP listening TCP port [default " d2s(DEFAULT_HTTP_PORT) "]"}, + {SET_ROOT_HTTP, 1, "roothttp", "HTTP Root Directory [default no root http (files not served but apis still available)]"}, + {SET_ROOT_BASE, 1, "rootbase", "Angular Base Root URL [default /opa]"}, + {SET_ROOT_API, 1, "rootapi", "HTML Root API URL [default /api]"}, + {ADD_ALIAS, 1, "alias", "Multiple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, - {SET_WORK_DIR, 1, "workdir", "Set the working directory [default: $PWD or current working directory]"}, - {SET_UPLOAD_DIR, 1, "uploaddir", "Directory for uploading files [default: workdir]"}, - {SET_ROOT_DIR, 1, "rootdir", "Root Directory of the application [default: workdir]"}, - {SET_SESSION_DIR, 1, "sessiondir", "OBSOLETE (was: Sessions file path)"}, + {SET_API_TIMEOUT, 1, "apitimeout", "Binding API timeout in seconds [default " d2s(DEFAULT_API_TIMEOUT) "]"}, + {SET_SESSION_TIMEOUT, 1, "cntxtimeout", "Client Session Context Timeout [default " d2s(DEFAULT_SESSION_TIMEOUT) "]"}, + {SET_CACHE_TIMEOUT, 1, "cache-eol", "Client cache end of live [default " d2s(DEFAULT_CACHE_TIMEOUT) "]"}, - {SET_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"}, - {SO_BINDING, 1, "binding", "Load the binding of path"}, - {SET_WEAK_LDPATH, 1, "weak-ldpaths","Same as --ldpaths but ignore errors"}, - {NO_LDPATH, 0, "no-ldpaths", "Discard default ldpaths loading"}, + {SET_WORK_DIR, 1, "workdir", "Set the working directory [default: $PWD or current working directory]"}, + {SET_UPLOAD_DIR, 1, "uploaddir", "Directory for uploading files [default: workdir] relative to workdir"}, + {SET_ROOT_DIR, 1, "rootdir", "Root Directory of the application [default: workdir] relative to workdir"}, - {SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=random, use --token="" to allow any token]"}, - {SET_RNDTOKEN, 0, "random-token","Enforce a random token"}, + {ADD_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"}, + {ADD_BINDING, 1, "binding", "Load the binding of path"}, + {ADD_WEAK_LDPATH, 1, "weak-ldpaths","Same as --ldpaths but ignore errors"}, + {SET_NO_LDPATH, 0, "no-ldpaths", "Discard default ldpaths loading"}, - {DISPLAY_VERSION, 0, "version", "Display version and copyright"}, - {DISPLAY_HELP, 0, "help", "Display this help"}, + {SET_TOKEN, 1, "token", "Initial Secret [default=random, use --token="" to allow any token]"}, + {SET_RANDOM_TOKEN, 0, "random-token","Enforce a random token"}, - {SET_MODE, 1, "mode", "Set the mode: either local, remote or global"}, + {GET_VERSION, 0, "version", "Display version and copyright"}, + {GET_HELP, 0, "help", "Display this help"}, -#if HAS_DBUS - {DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"}, - {DBUS_SERVICE, 1, "dbus-server", "Provides an afb service through dbus"}, +#if defined(WITH_DBUS_TRANSPARENCY) + {ADD_DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"}, + {ADD_DBUS_SERVICE, 1, "dbus-server", "Provide an afb service through dbus"}, #endif - {WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"}, - {WS_SERVICE, 1, "ws-server", "Provides an afb service through websockets"}, + {ADD_WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"}, + {ADD_WS_SERVICE, 1, "ws-server", "Provide an afb service through websockets"}, + + {ADD_AUTO_API, 1, "auto-api", "Automatic load of api of the given directory"}, - {SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default 10]"}, + {SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default " d2s(DEFAULT_MAX_SESSION_COUNT) "]"}, - {SET_TRACEREQ, 1, "tracereq", "Log the requests: no, common, extra, all"}, - {SET_TRACEDITF, 1, "traceditf", "Log the requests: no, common, extra, all"}, - {SET_TRACESVC, 1, "tracesvc", "Log the requests: no, all"}, - {SET_TRACEEVT, 1, "traceevt", "Log the requests: no, common, extra, all"}, - {SET_TRACESES, 1, "traceses", "Log the sessions: no, all"}, + {SET_TRACEREQ, 1, "tracereq", "Log the requests: none, common, extra, all"}, + {SET_TRACEEVT, 1, "traceevt", "Log the events: none, common, extra, all"}, + {SET_TRACESES, 1, "traceses", "Log the sessions: none, all"}, + {SET_TRACEAPI, 1, "traceapi", "Log the apis: none, common, api, event, all"}, + {SET_TRACEGLOB, 1, "traceglob", "Log the globals: none, all"}, +#if !defined(REMOVE_LEGACY_TRACE) + {SET_TRACEDITF, 1, "traceditf", "Log the daemons: no, common, all"}, + {SET_TRACESVC, 1, "tracesvc", "Log the services: no, all"}, +#endif - {ADD_CALL, 1, "call", "call at start format of val: API/VERB:json-args"}, + {ADD_CALL, 1, "call", "Call at start, format of val: API/VERB:json-args"}, - {SET_NO_HTTPD, 0, "no-httpd", "Forbids HTTP service"}, - {SET_EXEC, 0, "exec", "Execute the remaining arguments"}, + {SET_NO_HTTPD, 0, "no-httpd", "Forbid HTTP service"}, + {SET_EXEC, 0, "exec", "Execute the remaining arguments"}, -#if HAS_MONITORING - {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at /monitoring/"}, +#if defined(WITH_MONITORING_OPTION) + {SET_MONITORING, 0, "monitoring", "Enable HTTP monitoring at /monitoring/"}, #endif + + {SET_CONFIG, 1, "config", "Load options from the given config file"}, + {DUMP_CONFIG, 0, "dump-config", "Dump the config to stdout and exit"}, + + {ADD_SET, 1, "set", "Set parameters ([API]/[KEY]:JSON or {\"API\":{\"KEY\":JSON}}" }, + {SET_OUTPUT, 1, "output", "Redirect stdout and stderr to output file (when --daemon)"}, + + {SET_TRAP_FAULTS, 1, "trap-faults", "Trap faults: on, off, yes, no, true, false, 1, 0 (default: true)"}, + {0, 0, NULL, NULL} /* *INDENT-ON* */ }; +#if defined(WITH_MONITORING_OPTION) +static const char MONITORING_ALIAS[] = "/monitoring:"BINDING_INSTALL_DIR"/monitoring"; +#endif -struct enumdesc -{ - const char *name; - int value; +static const struct { + int optid; + int valdef; +} default_optint_values[] = { + { SET_PORT, DEFAULT_HTTP_PORT }, + { SET_API_TIMEOUT, DEFAULT_API_TIMEOUT }, + { SET_CACHE_TIMEOUT, DEFAULT_CACHE_TIMEOUT }, + { SET_SESSION_TIMEOUT, DEFAULT_SESSION_TIMEOUT }, + { SET_SESSIONMAX, DEFAULT_MAX_SESSION_COUNT } }; -static struct enumdesc tracereq_desc[] = { - { "no", 0 }, - { "common", afb_hook_flags_req_common }, - { "extra", afb_hook_flags_req_extra }, - { "all", afb_hook_flags_req_all }, - { NULL, 0 } +static const struct { + int optid; + const char *valdef; +} default_optstr_values[] = { + { SET_WORK_DIR, "." }, + { SET_ROOT_DIR, "." }, + { SET_UPLOAD_DIR, "." }, + { SET_ROOT_BASE, "/opa" }, + { SET_ROOT_API, "/api" } }; -static struct enumdesc traceditf_desc[] = { - { "no", 0 }, - { "common", afb_hook_flags_ditf_common }, - { "extra", afb_hook_flags_ditf_extra }, - { "all", afb_hook_flags_ditf_all }, - { NULL, 0 } -}; +/********************************** +* preparing items +***********************************/ -static struct enumdesc tracesvc_desc[] = { - { "no", 0 }, - { "all", afb_hook_flags_svc_all }, - { NULL, 0 } -}; +static char *shortopts = NULL; +static int *id2idx = NULL; -static struct enumdesc traceevt_desc[] = { - { "no", 0 }, - { "common", afb_hook_flags_evt_common }, - { "extra", afb_hook_flags_evt_extra }, - { "all", afb_hook_flags_evt_all }, - { NULL, 0 } -}; +static void *oomchk(void *ptr) +{ + if (!ptr) { + ERROR("Out of memory"); + exit(1); + } + return ptr; +} -static struct enumdesc traceses_desc[] = { - { "no", 0 }, - { "common", afb_hook_flags_session_common }, - { "all", afb_hook_flags_session_all }, - { NULL, 0 } -}; +static char is_short_option(int val) +{ + return (val >= 'a' && val <= 'z') || (val >= 'A' && val <= 'Z') || (val >= '0' && val <= '9'); +} + +static void init_options() +{ + int i, ns, mi, id; + + if (!shortopts) { + ns = 2; + mi = -1; + for (i = 0 ; optdefs[i].name ; i++) { + id = optdefs[i].id; + if (id > mi) + mi = id; + if (is_short_option(id)) + ns += 1 + !!optdefs[i].has_arg; + } + shortopts = oomchk(malloc(2 + ns)); + id2idx = oomchk(calloc(1 + mi, sizeof *id2idx)); + shortopts[ns = 0] = ':'; + for (i = 0 ; optdefs[i].name ; i++) { + id = optdefs[i].id; + id2idx[id] = i; + if (is_short_option(id)) { + shortopts[++ns] = (char)id; + if (optdefs[i].has_arg) + shortopts[++ns] = ':'; + } + } + shortopts[++ns] = 0; + } +} + +static const char *name_of_optid(int optid) +{ + return optdefs[id2idx[optid]].name; +} + +static int get_enum_val(const char *name, int optid, int (*func)(const char*)) +{ + int i; + + i = func(name); + if (i < 0) { + ERROR("option [--%s] bad value (found %s)", + name_of_optid(optid), name); + exit(1); + } + return i; +} -static struct enumdesc mode_desc[] = { - { "local", AFB_MODE_LOCAL }, - { "remote", AFB_MODE_REMOTE }, - { "global", AFB_MODE_GLOBAL }, - { NULL, 0 } -}; /*---------------------------------------------------------- | printversion @@ -258,15 +329,42 @@ static struct enumdesc mode_desc[] = { +--------------------------------------------------------- */ static void printVersion(FILE * file) { - static char pm[2] = { '-', '+' }; fprintf(file, "\n" - " AGL Framework Binder [AFB %s] %cDBUS %cMONITOR\n" + " AGL Framework Binder [AFB %s] " +#if defined(WITH_DBUS_TRANSPARENCY) + "+" +#else + "-" +#endif + "DBUS " +#if defined(WITH_MONITORING_OPTION) + "+" +#else + "-" +#endif + "MONITOR " +#if defined(WITH_SUPERVISION) + "+" +#else + "-" +#endif + "SUPERVISION [BINDINGS " +#if defined(WITH_LEGACY_BINDING_V1) + "+" +#else + "-" +#endif + "V1 " +#if defined(WITH_LEGACY_BINDING_VDYN) + "+" +#else + "-" +#endif + "VDYN +V2 +V3]\n" "\n", - AFB_VERSION, - pm[HAS_DBUS], - pm[HAS_MONITORING] - ); + AFB_VERSION + ); fprintf(file, " Copyright (C) 2015-2018 \"IoT.bzh\"\n" " AFB comes with ABSOLUTELY NO WARRANTY.\n" @@ -282,659 +380,661 @@ static void printVersion(FILE * file) static void printHelp(FILE * file, const char *name) { int ind; - char command[50]; - - fprintf(file, "%s:\nallowed options\n", name); - for (ind = 0; cliOptions[ind].name != NULL; ind++) { - strcpy(command, cliOptions[ind].name); - if (cliOptions[ind].has_arg) + char command[50], sht[4]; + + fprintf(file, "%s:\nallowed options\n", strrchr(name, '/') ? strrchr(name, '/') + 1 : name); + sht[3] = 0; + for (ind = 0; optdefs[ind].name != NULL; ind++) { + if (is_short_option(optdefs[ind].id)) { + sht[0] = '-'; + sht[1] = (char)optdefs[ind].id; + sht[2] = ','; + } else { + sht[0] = sht[1] = sht[2] = ' '; + } + strcpy(command, optdefs[ind].name); + if (optdefs[ind].has_arg) strcat(command, "=xxxx"); - fprintf(file, " --%-15s %s\n", command, cliOptions[ind].help); + fprintf(file, " %s --%-17s %s\n", sht, command, optdefs[ind].help); } fprintf(file, - "Example:\n %s --verbose --port=1234 --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n", + "Example:\n %s --verbose --port=" + d2s(DEFAULT_HTTP_PORT) + " --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n", name); } - -/*---------------------------------------------------------- - | adds a string to the list - +--------------------------------------------------------- */ -static void list_add(struct afb_config_list **head, char *value) +static void dump(struct json_object *config, FILE *file, const char *prefix, const char *title) { - struct afb_config_list *item; + const char *head, *tail; - /* - * search tail - */ - item = *head; - while (item != NULL) { - head = &item->next; - item = item->next; - } + if (title) + fprintf(file, "%s----BEGIN OF %s-----\n", prefix ?: "", title); - /* - * alloc the item - */ - item = malloc(sizeof *item); - if (item == NULL) { - ERROR("out of memory"); - exit(1); + head = json_object_to_json_string_ext(config, JSON_C_TO_STRING_PRETTY + |JSON_C_TO_STRING_SPACED|JSON_C_TO_STRING_NOSLASHESCAPE); + + if (!prefix) + fprintf(file, "%s\n", head); + else { + while(*head) { + for (tail = head ; *tail && *tail != '\n' ; tail++); + fprintf(file, "%s %.*s\n", prefix, (int)(tail - head), head); + head = tail + !!*tail; + } } - /* - * init the item - */ - *head = item; - item->value = value; - item->next = NULL; + if (title) + fprintf(file, "%s----END OF %s-----\n", prefix ?: "", title); } -/*--------------------------------------------------------- - | helpers for argument scanning - +--------------------------------------------------------- */ +/********************************** +* json helpers +***********************************/ -static const char *name_of_option(int optc) +static struct json_object *joomchk(struct json_object *value) { - AFB_options *o = cliOptions; - while (o->name && o->val != optc) - o++; - return o->name ? : ""; + return oomchk(value); } -static const char *current_argument(int optc) +static struct json_object *to_jstr(const char *value) +{ + return joomchk(json_object_new_string(value)); +} + +static struct json_object *to_jint(int value) +{ + return joomchk(json_object_new_int(value)); +} + +static struct json_object *to_jbool(int value) +{ + return joomchk(json_object_new_boolean(value)); +} + +/********************************** +* arguments helpers +***********************************/ + +static int string_to_bool(const char *value) +{ + static const char true_names[] = "1\0yes\0true\0on"; + static const char false_names[] = "0\0no\0false\0off"; + size_t pos; + + pos = 0; + while (pos < sizeof true_names) + if (strcasecmp(value, &true_names[pos])) + pos += 1 + strlen(&true_names[pos]); + else + return 1; + + pos = 0; + while (pos < sizeof false_names) + if (strcasecmp(value, &false_names[pos])) + pos += 1 + strlen(&false_names[pos]); + else + return 0; + + return -1; +} + +static void noarg(int optid) +{ + if (optarg) { + ERROR("option [--%s] need no value (found %s)", name_of_optid(optid), optarg); + exit(1); + } +} + +static const char *get_arg(int optid) { if (optarg == 0) { ERROR("option [--%s] needs a value i.e. --%s=xxx", - name_of_option(optc), name_of_option(optc)); + name_of_optid(optid), name_of_optid(optid)); exit(1); } return optarg; } -static char *argvalstr(int optc) +static int get_arg_bool(int optid) { - char *result = strdup(current_argument(optc)); - if (result == NULL) { - ERROR("can't alloc memory"); + int value = string_to_bool(get_arg(optid)); + if (value < 0) { + ERROR("option [--%s] needs a boolean value: yes/no, true/false, on/off, 1/0", + name_of_optid(optid)); exit(1); } - return result; + return value; } -static int argvalenum(int optc, struct enumdesc *desc) +static void config_del(struct json_object *config, int optid) { - int i; - size_t len; - char *list; - const char *name = current_argument(optc); + return json_object_object_del(config, name_of_optid(optid)); +} - i = 0; - while(desc[i].name && strcmp(desc[i].name, name)) - i++; - if (!desc[i].name) { - len = 0; - i = 0; - while(desc[i].name) - len += strlen(desc[i++].name); - list = malloc(len + i + i); - if (!i || !list) - ERROR("option [--%s] bad value (found %s)", - name_of_option(optc), name); - else { - i = 0; - strcpy(list, desc[i].name ? : ""); - while(desc[++i].name) - strcat(strcat(list, ", "), desc[i].name); - ERROR("option [--%s] bad value, only accepts values %s (found %s)", - name_of_option(optc), list, name); - } - free(list); - exit(1); +static int config_has(struct json_object *config, int optid) +{ + return json_object_object_get_ex(config, name_of_optid(optid), NULL); +} + +static int config_has_bool(struct json_object *config, int optid) +{ + struct json_object *x; + return json_object_object_get_ex(config, name_of_optid(optid), &x) + && json_object_get_boolean(x); +} + +static int config_has_str(struct json_object *config, int optid, const char *val) +{ + int i, n; + struct json_object *a; + + if (!json_object_object_get_ex(config, name_of_optid(optid), &a)) + return 0; + + if (!json_object_is_type(a, json_type_array)) + return !strcmp(val, json_object_get_string(a)); + + n = (int)json_object_array_length(a); + for (i = 0 ; i < n ; i++) { + if (!strcmp(val, json_object_get_string(json_object_array_get_idx(a, i)))) + return 1; } - return desc[i].value; + return 0; +} + +static void config_set(struct json_object *config, int optid, struct json_object *val) +{ + json_object_object_add(config, name_of_optid(optid), val); +} + +static void config_set_str(struct json_object *config, int optid, const char *val) +{ + config_set(config, optid, to_jstr(val)); +} + +static void config_set_optstr(struct json_object *config, int optid) +{ + config_set_str(config, optid, get_arg(optid)); +} + +static void config_set_int(struct json_object *config, int optid, int value) +{ + config_set(config, optid, to_jint(value)); +} + +static void config_set_bool(struct json_object *config, int optid, int value) +{ + config_set(config, optid, to_jbool(value)); } -static int argvalint(int optc, int mini, int maxi, int base) +static void config_set_optint_base(struct json_object *config, int optid, int mini, int maxi, int base) { const char *beg, *end; long int val; - beg = current_argument(optc); + + beg = get_arg(optid); val = strtol(beg, (char**)&end, base); if (*end || end == beg) { ERROR("option [--%s] requires a valid integer (found %s)", - name_of_option(optc), beg); + name_of_optid(optid), beg); exit(1); } if (val < (long int)mini || val > (long int)maxi) { - ERROR("option [--%s] value out of bounds (not %d<=%ld<=%d)", - name_of_option(optc), mini, val, maxi); + ERROR("option [--%s] value %ld out of bounds (not in [%d , %d])", + name_of_optid(optid), val, mini, maxi); exit(1); } - return (int)val; + config_set_int(config, optid, (int)val); } -static int argvalintdec(int optc, int mini, int maxi) +static void config_set_optint(struct json_object *config, int optid, int mini, int maxi) { - return argvalint(optc, mini, maxi, 10); + return config_set_optint_base(config, optid, mini, maxi, 10); } -static void noarg(int optc) +static void config_set_optenum(struct json_object *config, int optid, int (*func)(const char*)) { - if (optarg != 0) { - ERROR("option [--%s] need no value (found %s)", name_of_option(optc), optarg); - exit(1); - } + const char *name = get_arg(optid); + get_enum_val(name, optid, func); + config_set_str(config, optid, name); } -static char **make_exec(char **argv) +static void config_add(struct json_object *config, int optid, struct json_object *val) { - char **result, *iter; - size_t length; - int i; - - length = 0; - for (i = 0 ; argv[i] ; i++) - length += strlen(argv[i]) + 1; - - result = malloc(length + ((unsigned)(i + 1)) * sizeof *result); - if (result == NULL) { - ERROR("can't alloc memory"); - exit(1); + struct json_object *a; + if (!json_object_object_get_ex(config, name_of_optid(optid), &a)) { + a = joomchk(json_object_new_array()); + json_object_object_add(config, name_of_optid(optid), a); } + json_object_array_add(a, val); +} - iter = (char*)&result[i+1]; - for (i = 0 ; argv[i] ; i++) { - result[i] = iter; - iter = stpcpy(iter, argv[i]) + 1; - } - result[i] = NULL; - return result; +static void config_add_str(struct json_object *config, int optid, const char *val) +{ + config_add(config, optid, to_jstr(val)); } -/*--------------------------------------------------------- - | Parse option and launch action - +--------------------------------------------------------- */ +static void config_add_optstr(struct json_object *config, int optid) +{ + config_add_str(config, optid, get_arg(optid)); +} -static void parse_arguments(int argc, char **argv, struct afb_config *config) +static void config_mix2_cb(void *closure, struct json_object *obj, const char *name) { - char *programName = argv[0]; - int optc, ind; - int nbcmd; - struct option *gnuOptions; + struct json_object *dest, *base = closure; - // ------------------ Process Command Line ----------------------- + if (!name) + name = ""; - // build GNU getopt info from cliOptions - nbcmd = sizeof(cliOptions) / sizeof(AFB_options); - gnuOptions = malloc(sizeof(*gnuOptions) * (unsigned)nbcmd); - for (ind = 0; ind < nbcmd; ind++) { - gnuOptions[ind].name = cliOptions[ind].name; - gnuOptions[ind].has_arg = cliOptions[ind].has_arg; - gnuOptions[ind].flag = 0; - gnuOptions[ind].val = cliOptions[ind].val; + if (!json_object_object_get_ex(base, name, &dest)) { + dest = joomchk(json_object_new_object()); + json_object_object_add(base, name, dest); } + if (json_object_is_type(obj, json_type_object)) + wrap_json_object_add(dest, obj); + else + json_object_object_add(dest, "", json_object_get(obj)); +} - // get all options from command line - while ((optc = getopt_long(argc, argv, shortopts, gnuOptions, NULL)) != EOF) { - switch (optc) { - case SET_VERBOSE: - verbosity++; - break; - - case SET_QUIET: - verbosity--; - break; +static void config_mix2(struct json_object *config, int optid, struct json_object *val) +{ + struct json_object *obj; - case SET_TCP_PORT: - config->httpdPort = argvalintdec(optc, 1024, 32767); - break; + if (!json_object_object_get_ex(config, name_of_optid(optid), &obj)) { + obj = joomchk(json_object_new_object()); + json_object_object_add(config, name_of_optid(optid), obj); + } + wrap_json_for_all(val, config_mix2_cb, obj); +} - case SET_APITIMEOUT: - config->apiTimeout = argvalintdec(optc, 0, INT_MAX); - break; +static void config_mix2_str(struct json_object *config, int optid, const char *val) +{ + size_t st1, st2; + const char *api, *key; + struct json_object *obj, *sub; + enum json_tokener_error jerr; + + st1 = strcspn(val, "/:{[\""); + st2 = strcspn(&val[st1], ":{[\""); + if (val[st1] != '/' || val[st1 + st2] != ':') { + obj = json_tokener_parse_verbose(val, &jerr); + if (jerr != json_tokener_success) + obj = json_object_new_string(val); + } else { + api = st1 == 0 ? "*" : strndupa(val, st1); + val += st1 + 1; + key = st2 <= 1 || (st2 == 2 && *val == '*') ? NULL : strndupa(val, st2 - 1); + val += st2; + sub = json_tokener_parse_verbose(val, &jerr); + if (jerr != json_tokener_success) + sub = json_object_new_string(val); + + if (key) { + obj = json_object_new_object(); + json_object_object_add(obj, key, sub); + sub = obj; + } + obj = json_object_new_object(); + json_object_object_add(obj, api, sub); + } + config_mix2(config, optid, obj); + json_object_put(obj); +} - case SET_CNTXTIMEOUT: - config->cntxTimeout = argvalintdec(optc, 0, INT_MAX); - break; +static void config_mix2_optstr(struct json_object *config, int optid) +{ + config_mix2_str(config, optid, get_arg(optid)); +} - case SET_ROOT_DIR: - config->rootdir = argvalstr(optc); - INFO("Forcing Rootdir=%s", config->rootdir); - break; +/*--------------------------------------------------------- + | set the log levels + +--------------------------------------------------------- */ - case SET_ROOT_HTTP: - config->roothttp = argvalstr(optc); - INFO("Forcing Root HTTP=%s", config->roothttp); - break; +static void set_log(const char *args) +{ + char o = 0, s, *p, *i = strdupa(args); + int lvl; + + for(;;) switch (*i) { + case 0: + return; + case '+': + case '-': + o = *i; + /*@fallthrough@*/ + case ' ': + case ',': + i++; + break; + default: + p = i; + while (isalpha(*p)) p++; + s = *p; + *p = 0; + lvl = verbose_level_of_name(i); + if (lvl < 0) { + i = strdupa(i); + *p = s; + ERROR("Bad log name '%s' in %s", i, args); + exit(1); + } + *p = s; + i = p; + if (o == '-') + verbose_sub(lvl); + else { + if (!o) { + verbose_clear(); + o = '+'; + } + verbose_add(lvl); + } + break; + } +} - case SET_ROOT_BASE: - config->rootbase = argvalstr(optc); - INFO("Forcing Rootbase=%s", config->rootbase); - break; +/*--------------------------------------------------------- + | Parse option and launch action + +--------------------------------------------------------- */ - case SET_ROOT_API: - config->rootapi = argvalstr(optc); - INFO("Forcing Rootapi=%s", config->rootapi); +static void parse_arguments_inner(int argc, char **argv, struct json_object *config, struct option *options) +{ + struct json_object *conf; + int optid, cind, dodump = 0; + + for (;;) { + cind = optind; + optid = getopt_long(argc, argv, shortopts, options, NULL); + if (optid < 0) { + /* end of options */ break; - - case SET_ALIAS: - list_add(&config->aliases, argvalstr(optc)); + } + switch (optid) { + case SET_VERBOSE: + verbose_inc(); break; - case SET_AUTH_TOKEN: - config->token = argvalstr(optc); + case SET_COLOR: + verbose_colorize(); break; - case SET_LDPATH: - list_add(&config->ldpaths, argvalstr(optc)); + case SET_QUIET: + verbose_dec(); break; - case SET_WEAK_LDPATH: - list_add(&config->weak_ldpaths, argvalstr(optc)); + case SET_LOG: + set_log(get_arg(optid)); break; - case NO_LDPATH: - noarg(optc); - config->no_ldpaths = 1; + case SET_PORT: + config_set_optint(config, optid, 1024, 32767); break; - case ADD_CALL: - list_add(&config->calls, argvalstr(optc)); + case SET_API_TIMEOUT: + case SET_SESSION_TIMEOUT: + case SET_CACHE_TIMEOUT: + config_set_optint(config, optid, 0, INT_MAX); break; - case SET_SESSION_DIR: - /* config->sessiondir = argvalstr(optc); */ - WARNING("Obsolete option %s ignored", name_of_option(optc)); + case SET_SESSIONMAX: + config_set_optint(config, optid, 1, INT_MAX); break; + case SET_ROOT_DIR: + case SET_ROOT_HTTP: + case SET_ROOT_BASE: + case SET_ROOT_API: + case SET_TOKEN: case SET_UPLOAD_DIR: - config->uploaddir = argvalstr(optc); - break; - case SET_WORK_DIR: - config->workdir = argvalstr(optc); + case SET_NAME: + config_set_optstr(config, optid); break; - case SET_CACHE_TIMEOUT: - config->cacheTimeout = argvalintdec(optc, 0, INT_MAX); +#if defined(WITH_DBUS_TRANSPARENCY) + case ADD_DBUS_CLIENT: + case ADD_DBUS_SERVICE: +#endif + case ADD_ALIAS: + case ADD_LDPATH: + case ADD_WEAK_LDPATH: + case ADD_CALL: + case ADD_WS_CLIENT: + case ADD_WS_SERVICE: + case ADD_BINDING: + case ADD_AUTO_API: + config_add_optstr(config, optid); break; - case SET_SESSIONMAX: - config->nbSessionMax = argvalintdec(optc, 1, INT_MAX); + case ADD_SET: + config_mix2_optstr(config, optid); break; - case SET_FORGROUND: - noarg(optc); - config->background = 0; +#if defined(WITH_MONITORING_OPTION) + case SET_MONITORING: +#endif + case SET_RANDOM_TOKEN: + case SET_NO_HTTPD: + case SET_NO_LDPATH: + noarg(optid); + config_set_bool(config, optid, 1); break; - case SET_BACKGROUND: - noarg(optc); - config->background = 1; - break; - case SET_NAME: - config->name = argvalstr(optc); + case SET_FOREGROUND: + case SET_BACKGROUND: + case SET_DAEMON: + noarg(optid); + config_set_bool(config, SET_DAEMON, optid != SET_FOREGROUND); break; - case SET_MODE: - config->mode = argvalenum(optc, mode_desc); + case SET_TRAP_FAULTS: + config_set_bool(config, optid, get_arg_bool(optid)); break; -#if HAS_DBUS - case DBUS_CLIENT: - list_add(&config->dbus_clients, argvalstr(optc)); - break; - case DBUS_SERVICE: - list_add(&config->dbus_servers, argvalstr(optc)); + case SET_TRACEREQ: + config_set_optenum(config, optid, afb_hook_flags_xreq_from_text); break; -#endif - case WS_CLIENT: - list_add(&config->ws_clients, argvalstr(optc)); + case SET_TRACEEVT: + config_set_optenum(config, optid, afb_hook_flags_evt_from_text); break; - case WS_SERVICE: - list_add(&config->ws_servers, argvalstr(optc)); + case SET_TRACESES: + config_set_optenum(config, optid, afb_hook_flags_session_from_text); break; - case SO_BINDING: - list_add(&config->so_bindings, argvalstr(optc)); + case SET_TRACEAPI: + config_set_optenum(config, optid, afb_hook_flags_api_from_text); break; - case SET_TRACEREQ: - config->tracereq = argvalenum(optc, tracereq_desc); + case SET_TRACEGLOB: + config_set_optenum(config, optid, afb_hook_flags_global_from_text); break; +#if !defined(REMOVE_LEGACY_TRACE) case SET_TRACEDITF: - config->traceditf = argvalenum(optc, traceditf_desc); + config_set_optenum(config, optid, afb_hook_flags_legacy_ditf_from_text); break; case SET_TRACESVC: - config->tracesvc = argvalenum(optc, tracesvc_desc); - break; - - case SET_TRACEEVT: - config->traceevt = argvalenum(optc, traceevt_desc); - break; - - case SET_TRACESES: - config->traceses = argvalenum(optc, traceses_desc); - break; - - case SET_NO_HTTPD: - noarg(optc); - config->noHttpd = 1; + config_set_optenum(config, optid, afb_hook_flags_legacy_svc_from_text); break; +#endif case SET_EXEC: - config->exec = make_exec(&argv[optind]); - optind = argc; /* stop option scanning */ + if (optind == argc) { + ERROR("The option --exec requires arguments"); + exit(1); + } + while (optind != argc) + config_add_str(config, optid, argv[optind++]); break; - case SET_RNDTOKEN: - config->random_token = 1; + case SET_CONFIG: + conf = json_object_from_file(get_arg(optid)); + if (!conf) { + ERROR("Can't read config file %s", get_arg(optid)); + exit(1); + } + wrap_json_object_add(config, conf); + json_object_put(conf); break; -#if HAS_MONITORING - case SET_MONITORING: - config->monitoring = 1; + case DUMP_CONFIG: + noarg(optid); + dodump = 1; break; -#endif - case DISPLAY_VERSION: - noarg(optc); + case GET_VERSION: + noarg(optid); printVersion(stdout); exit(0); - case DISPLAY_HELP: - printHelp(stdout, programName); + case GET_HELP: + printHelp(stdout, argv[0]); exit(0); default: + ERROR("Bad option detected, check %s", argv[cind]); exit(1); } } - free(gnuOptions); + /* TODO: check for extra value */ + + if (dodump) { + dump(config, stdout, NULL, NULL); + exit(0); + } } -static void fulfill_config(struct afb_config *config) +static void parse_arguments(int argc, char **argv, struct json_object *config) { - // default HTTP port - if (config->httpdPort == 0) - config->httpdPort = 1234; - - // default binding API timeout - if (config->apiTimeout == 0) - config->apiTimeout = DEFLT_API_TIMEOUT; - - // default AUTH_TOKEN - if (config->random_token) - config->token = NULL; - - // cache timeout default one hour - if (config->cacheTimeout == 0) - config->cacheTimeout = DEFLT_CACHE_TIMEOUT; + int ind; + struct option *options; + + /* create GNU getopt options from optdefs */ + options = malloc((sizeof optdefs / sizeof * optdefs) * sizeof * options); + for (ind = 0; optdefs[ind].name; ind++) { + options[ind].name = optdefs[ind].name; + options[ind].has_arg = optdefs[ind].has_arg; + options[ind].flag = NULL; + options[ind].val = optdefs[ind].id; + } + memset(&options[ind], 0, sizeof options[ind]); - // cache timeout default one hour - if (config->cntxTimeout == 0) - config->cntxTimeout = DEFLT_CNTX_TIMEOUT; + /* parse the arguments */ + parse_arguments_inner(argc, argv, config, options); - // max count of sessions - if (config->nbSessionMax == 0) - config->nbSessionMax = CTX_NBCLIENTS; + /* release the memory of options */ + free(options); +} - /* set directories */ - if (config->workdir == NULL) - config->workdir = "."; +static void fulfill_config(struct json_object *config) +{ + int i; - if (config->rootdir == NULL) - config->rootdir = "."; + for (i = 0 ; i < sizeof default_optint_values / sizeof * default_optint_values ; i++) + if (!config_has(config, default_optint_values[i].optid)) + config_set_int(config, default_optint_values[i].optid, default_optint_values[i].valdef); - if (config->uploaddir == NULL) - config->uploaddir = "."; + for (i = 0 ; i < sizeof default_optstr_values / sizeof * default_optstr_values ; i++) + if (!config_has(config, default_optstr_values[i].optid)) + config_set_str(config, default_optstr_values[i].optid, default_optstr_values[i].valdef); - // if no Angular/HTML5 rootbase let's try '/' as default - if (config->rootbase == NULL) - config->rootbase = "/opa"; + // default AUTH_TOKEN + if (config_has_bool(config, SET_RANDOM_TOKEN)) + config_del(config, SET_TOKEN); - if (config->rootapi == NULL) - config->rootapi = "/api"; + if (!config_has(config, ADD_LDPATH) && !config_has(config, ADD_WEAK_LDPATH) && !config_has_bool(config, SET_NO_LDPATH)) + config_add_str(config, ADD_LDPATH, BINDING_INSTALL_DIR); - if (config->ldpaths == NULL && config->weak_ldpaths == NULL && !config->no_ldpaths) - list_add(&config->ldpaths, BINDING_INSTALL_DIR); +#if defined(WITH_MONITORING_OPTION) + if (config_has_bool(config, SET_MONITORING) && !config_has_str(config, ADD_ALIAS, MONITORING_ALIAS)) + config_add_str(config, ADD_ALIAS, MONITORING_ALIAS); +#endif -#if HAS_MONITORING - if (config->monitoring) - list_add(&config->aliases, strdup("/monitoring:"BINDING_INSTALL_DIR"/monitoring")); +#if !defined(REMOVE_LEGACY_TRACE) && 0 + config->traceapi |= config->traceditf | config->tracesvc; #endif +} - // if no config dir create a default path from uploaddir - if (config->console == NULL) { - config->console = malloc(512); - strncpy(config->console, config->uploaddir, 512); - strncat(config->console, "/AFB-console.out", 512); - } +void afb_config_dump(struct json_object *config) +{ + dump(config, stderr, "--", "CONFIG"); } -void afb_config_dump(struct afb_config *config) -{ - struct afb_config_list *l; - struct enumdesc *e; - char **v; - -#define NN(x) (x)?:"" -#define P(...) fprintf(stderr, __VA_ARGS__) -#define PF(x) P("-- %15s: ", #x) -#define PE P("\n") -#define S(x) PF(x);P("%s",NN(config->x));PE; -#define D(x) PF(x);P("%d",config->x);PE; -#define B(x) PF(x);P("%s",config->x?"yes":"no");PE; -#define L(x) PF(x);l=config->x;if(l){P("%s\n",NN(l->value));for(l=l->next;l;l=l->next)P("-- %15s %s\n","",NN(l->value));}else PE; -#define E(x,d) for(e=d;e->name&&e->value!=config->x;e++);if(e->name){PF(x);P("%s",e->name);PE;}else{D(x);} -#define V(x) P("-- %15s:", #x);for(v=config->x;v&&*v;v++)P(" %s",*v); PE; - - P("---BEGIN-OF-CONFIG---\n"); - S(console) - S(rootdir) - S(roothttp) - S(rootbase) - S(rootapi) - S(workdir) - S(uploaddir) - S(token) - S(name) - - L(aliases) -#if HAS_DBUS - L(dbus_clients) - L(dbus_servers) -#endif - L(ws_clients) - L(ws_servers) - L(so_bindings) - L(ldpaths) - L(weak_ldpaths) - L(calls) - - V(exec) - - D(httpdPort) - D(cacheTimeout) - D(apiTimeout) - D(cntxTimeout) - D(nbSessionMax) - - E(mode,mode_desc) - E(tracereq,tracereq_desc) - E(traceditf,traceditf_desc) - E(tracesvc,tracesvc_desc) - E(traceevt,traceevt_desc) - E(traceses,traceses_desc) - - B(no_ldpaths) - B(noHttpd) - B(background) -#if HAS_MONITORING - B(monitoring) -#endif - B(random_token) - P("---END-OF-CONFIG---\n"); +static void on_environment(struct json_object *config, int optid, const char *name, void (*func)(struct json_object*, int, const char*)) +{ + char *value = getenv(name); -#undef V -#undef E -#undef L -#undef B -#undef D -#undef S -#undef PE -#undef PF -#undef P -#undef NN + if (value && *value) + func(config, optid, value); } -static void on_environment_list(struct afb_config_list **to, const char *name) +static void on_environment_enum(struct json_object *config, int optid, const char *name, int (*func)(const char*)) { char *value = getenv(name); - if (value) - list_add(to, value); + if (value) { + if (func(value) == -1) + WARNING("Unknown value %s for environment variable %s, ignored", value, name); + else + config_set_str(config, optid, value); + } } -static void on_environment_enum(int *to, const char *name, struct enumdesc *desc) +static void on_environment_bool(struct json_object *config, int optid, const char *name) { char *value = getenv(name); + int asbool; if (value) { - while (desc->name) { - if (strcmp(desc->name, value)) - desc++; - else { - *to = desc->value; - return; - } - } - WARNING("Unknown value %s for environment variable %s, ignored", value, name); + asbool = string_to_bool(value); + if (asbool < 0) + WARNING("Unknown value %s for environment variable %s, ignored", value, name); + else + config_set_bool(config, optid, asbool); } } -static void parse_environment(struct afb_config *config) +static void parse_environment(struct json_object *config) { - on_environment_enum(&config->tracereq, "AFB_TRACEREQ", tracereq_desc); - on_environment_enum(&config->traceditf, "AFB_TRACEDITF", traceditf_desc); - on_environment_enum(&config->tracesvc, "AFB_TRACESVC", tracesvc_desc); - on_environment_enum(&config->traceevt, "AFB_TRACEEVT", traceevt_desc); - on_environment_enum(&config->traceses, "AFB_TRACESES", traceses_desc); - on_environment_list(&config->ldpaths, "AFB_LDPATHS"); + on_environment_enum(config, SET_TRACEREQ, "AFB_TRACEREQ", afb_hook_flags_xreq_from_text); + on_environment_enum(config, SET_TRACEEVT, "AFB_TRACEEVT", afb_hook_flags_evt_from_text); + on_environment_enum(config, SET_TRACESES, "AFB_TRACESES", afb_hook_flags_session_from_text); + on_environment_enum(config, SET_TRACEAPI, "AFB_TRACEAPI", afb_hook_flags_api_from_text); + on_environment_enum(config, SET_TRACEGLOB, "AFB_TRACEGLOB", afb_hook_flags_global_from_text); + on_environment(config, ADD_LDPATH, "AFB_LDPATHS", config_add_str); + on_environment(config, ADD_SET, "AFB_SET", config_mix2_str); +#if !defined(REMOVE_LEGACY_TRACE) + on_environment_enum(config, SET_TRACEDITF, "AFB_TRACEDITF", afb_hook_flags_legacy_ditf_from_text); + on_environment_enum(config, SET_TRACESVC, "AFB_TRACESVC", afb_hook_flags_legacy_svc_from_text); +#endif + on_environment_bool(config, SET_TRAP_FAULTS, "AFB_TRAP_FAULTS"); } -struct afb_config *afb_config_parse_arguments(int argc, char **argv) +struct json_object *afb_config_parse_arguments(int argc, char **argv) { - struct afb_config *result; + struct json_object *result; - result = calloc(1, sizeof *result); + init_options(); + + result = json_object_new_object(); parse_environment(result); parse_arguments(argc, argv, result); fulfill_config(result); - if (verbosity >= 3) + if (verbose_wants(Log_Level_Info)) afb_config_dump(result); return result; } -struct json_object *afb_config_json(struct afb_config *config) -{ - struct json_object *r, *a; - struct afb_config_list *l; - struct enumdesc *e; - char **v; - -#define XA(t,o) json_object_array_add(t,o); -#define XO(t,x,o) json_object_object_add(t,x,o); -#define YS(s) ((s)?json_object_new_string(s):NULL) - -#define AO(o) XA(a,o) -#define AS(s) AO(YS(s)) -#define RO(x,o) XO(r,x,o) -#define RS(x,s) RO(x,YS(s)) -#define RA(x) RO(x,(a=json_object_new_array())) -#define RI(x,i) RO(x,json_object_new_int(i)) -#define RB(x,b) RO(x,json_object_new_boolean(b)) - -#define S(x) RS(#x,config->x) -#define V(x) RA(#x);for(v=config->x;v&&*v;v++)AS(*v); -#define L(x) RA(#x);for(l=config->x;l;l=l->next)AS(l->value); -#define D(x) RI(#x,config->x) -#define B(x) RB(#x,config->x) -#define E(x,d) for(e=d;e->name&&e->value!=config->x;e++);if(e->name){RS(#x,e->name);}else{D(x);} - - r = json_object_new_object(); - S(console) - S(rootdir) - S(roothttp) - S(rootbase) - S(rootapi) - S(workdir) - S(uploaddir) - S(token) - S(name) - - L(aliases) -#if HAS_DBUS - L(dbus_clients) - L(dbus_servers) -#endif - L(ws_clients) - L(ws_servers) - L(so_bindings) - L(ldpaths) - L(weak_ldpaths) - L(calls) - - V(exec) - - D(httpdPort) - D(cacheTimeout) - D(apiTimeout) - D(cntxTimeout) - D(nbSessionMax) - - E(mode,mode_desc) - E(tracereq,tracereq_desc) - E(traceditf,traceditf_desc) - E(tracesvc,tracesvc_desc) - E(traceevt,traceevt_desc) - E(traceses,traceses_desc) - - B(no_ldpaths) - B(noHttpd) - B(background) -#if HAS_MONITORING - B(monitoring) -#endif - B(random_token) - -#undef E -#undef B -#undef D -#undef L -#undef V -#undef S - -#undef RB -#undef RI -#undef RA -#undef RS -#undef RS -#undef AS -#undef AO - -#undef YS -#undef XO -#undef XA - - return r; +struct json_object *afb_config_json(struct json_object *config) +{ + return NULL; }