X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=d906bcb719c30ef6b68a6a7bf10f5dd3bfc3f38e;hb=9bc48026a93e8330a2bd2795e78d5951c16b7d33;hp=e2fec3a0ea9d98cab94330943295ca81ce104ed5;hpb=84e049cf2312286ad1895cbebc82cabd5c30b9bb;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index e2fec3a0..d906bcb7 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -16,25 +16,26 @@ */ #define _GNU_SOURCE -#define NO_BINDING_VERBOSE_MACRO +#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include #include #include #include +#include #include "verbose.h" #include "afb-config.h" #include "afb-hook.h" -#include +#include #if !defined(BINDING_INSTALL_DIR) #error "you should define BINDING_INSTALL_DIR" #endif -#define AFB_VERSION "0.5" +#define AFB_VERSION "0.6" // default #define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection @@ -44,18 +45,14 @@ #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 CTX_NBCLIENTS 10 // allow a default of 10 authenticated // clients // Define command line option -#define SET_VERBOSE 'v' #define SET_BACKGROUND 2 #define SET_FORGROUND 3 -#define SET_QUIET 'q' -#define SET_TCP_PORT 5 #define SET_ROOT_DIR 6 #define SET_ROOT_BASE 7 #define SET_ROOT_API 8 @@ -64,16 +61,13 @@ #define SET_CACHE_TIMEOUT 10 #define SET_SESSION_DIR 11 -#define SET_AUTH_TOKEN 12 #define SET_LDPATH 13 #define SET_APITIMEOUT 14 #define SET_CNTXTIMEOUT 15 - -#define DISPLAY_VERSION 'V' -#define DISPLAY_HELP 'h' +#define SET_WEAK_LDPATH 16 +#define NO_LDPATH 17 #define SET_MODE 18 -#define SET_READYFD 19 #define DBUS_CLIENT 20 #define DBUS_SERVICE 21 @@ -86,13 +80,34 @@ #define SET_ROOT_HTTP 26 -#define SET_TRACEREQ 27 - #define SET_NO_HTTPD 28 +#define ADD_CALL 'c' +#define SET_TRACEDITF 'D' +#define SET_TRACEEVT 'E' #define SET_EXEC 'e' +#define DISPLAY_HELP 'h' +#if defined(WITH_MONITORING_OPTION) +#define SET_MONITORING 'M' +#endif +#define SET_NAME 'n' +#define SET_TCP_PORT 'p' +#define SET_QUIET 'q' +#define SET_RNDTOKEN 'r' +#define SET_TRACESVC 'S' +#define SET_TRACEREQ 'T' +#define SET_AUTH_TOKEN 't' +#define SET_UPLOAD_DIR 'u' +#define DISPLAY_VERSION 'V' +#define SET_VERBOSE 'v' +#define SET_WORK_DIR 'w' -#define SHORTOPTS "vqhVe" +const char shortopts[] = + "c:D:E:ehn:p:qrT:t:u:Vvw:" +#if defined(WITH_MONITORING_OPTION) + "M" +#endif +; // Command line structure hold cli --command + help text typedef struct { @@ -111,41 +126,56 @@ static AFB_options cliOptions[] = { {SET_FORGROUND, 0, "foreground", "Get all in foreground mode"}, {SET_BACKGROUND, 0, "daemon", "Get all in background mode"}, + {SET_NAME, 1, "name", "Set the visible name"}, + {SET_TCP_PORT, 1, "port", "HTTP listening TCP port [default 1234]"}, - {SET_ROOT_DIR, 1, "rootdir", "Root Directory [default $HOME/.AFB]"}, - {SET_ROOT_HTTP, 1, "roothttp", "HTTP Root Directory [default rootdir]"}, + {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", "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, + {SET_ALIAS, 1, "alias", "Multiple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, {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_SESSION_DIR, 1, "sessiondir", "Sessions file path [default rootdir/sessions]"}, + {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_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_AUTH_TOKEN, 1, "token", "Initial Secret [default=no-session, --token= for session without authentication]"}, + {SET_RNDTOKEN, 0, "random-token","Enforce a random token"}, {DISPLAY_VERSION, 0, "version", "Display version and copyright"}, {DISPLAY_HELP, 0, "help", "Display this help"}, {SET_MODE, 1, "mode", "Set the mode: either local, remote or global"}, - {SET_READYFD, 1, "readyfd", "Set the #fd to signal when ready"}, {DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"}, {DBUS_SERVICE, 1, "dbus-server", "Provides an afb service through dbus"}, {WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"}, {WS_SERVICE, 1, "ws-server", "Provides an afb service through websockets"}, - {SO_BINDING, 1, "binding", "Load the binding of path"}, {SET_SESSIONMAX, 1, "session-max", "Max count of session simultaneously [default 10]"}, {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"}, + + {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"}, +#if defined(WITH_MONITORING_OPTION) + {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at /monitoring/"}, +#endif {0, 0, NULL, NULL} /* *INDENT-ON* */ }; @@ -165,6 +195,28 @@ static struct enumdesc tracereq_desc[] = { { NULL, 0 } }; +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 } +}; + +static struct enumdesc tracesvc_desc[] = { + { "no", 0 }, + { "all", afb_hook_flags_svc_all }, + { NULL, 0 } +}; + +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 struct enumdesc mode_desc[] = { { "local", AFB_MODE_LOCAL }, { "remote", AFB_MODE_REMOTE }, @@ -210,6 +262,7 @@ static void printHelp(FILE * file, const char *name) name); } + /*---------------------------------------------------------- | adds a string to the list +--------------------------------------------------------- */ @@ -218,7 +271,7 @@ static void list_add(struct afb_config_list **head, char *value) struct afb_config_list *item; /* - * search tail + * search tail */ item = *head; while (item != NULL) { @@ -227,7 +280,7 @@ static void list_add(struct afb_config_list **head, char *value) } /* - * alloc the item + * alloc the item */ item = malloc(sizeof *item); if (item == NULL) { @@ -236,7 +289,7 @@ static void list_add(struct afb_config_list **head, char *value) } /* - * init the item + * init the item */ *head = item; item->value = value; @@ -247,21 +300,40 @@ static void list_add(struct afb_config_list **head, char *value) | helpers for argument scanning +--------------------------------------------------------- */ -static char *argvalstr(int index) +static const char *name_of_option(int optc) +{ + AFB_options *o = cliOptions; + while (o->name && o->val != optc) + o++; + return o->name ? : ""; +} + +static const char *current_argument(int optc) { if (optarg == 0) { ERROR("option [--%s] needs a value i.e. --%s=xxx", - cliOptions[index].name, cliOptions[index].name); + name_of_option(optc), name_of_option(optc)); exit(1); } return optarg; } -static int argvalenum(int index, struct enumdesc *desc) +static char *argvalstr(int optc) +{ + char *result = strdup(current_argument(optc)); + if (result == NULL) { + ERROR("can't alloc memory"); + exit(1); + } + return result; +} + +static int argvalenum(int optc, struct enumdesc *desc) { int i; size_t len; - char *list, *name = argvalstr(index); + char *list; + const char *name = current_argument(optc); i = 0; while(desc[i].name && strcmp(desc[i].name, name)) @@ -274,14 +346,14 @@ static int argvalenum(int index, struct enumdesc *desc) list = malloc(len + i + i); if (!i || !list) ERROR("option [--%s] bad value (found %s)", - cliOptions[index].name, name); + 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)", - cliOptions[index].name, list, name); + name_of_option(optc), list, name); } free(list); exit(1); @@ -289,34 +361,34 @@ static int argvalenum(int index, struct enumdesc *desc) return desc[i].value; } -static int argvalint(int index, int mini, int maxi, int base) +static int argvalint(int optc, int mini, int maxi, int base) { - char *beg, *end; + const char *beg, *end; long int val; - beg = argvalstr(index); - val = strtol(beg, &end, base); + beg = current_argument(optc); + val = strtol(beg, (char**)&end, base); if (*end || end == beg) { ERROR("option [--%s] requires a valid integer (found %s)", - cliOptions[index].name, beg); + name_of_option(optc), beg); exit(1); } if (val < (long int)mini || val > (long int)maxi) { ERROR("option [--%s] value out of bounds (not %d<=%ld<=%d)", - cliOptions[index].name, mini, val, maxi); + name_of_option(optc), mini, val, maxi); exit(1); } return (int)val; } -static int argvalintdec(int index, int mini, int maxi) +static int argvalintdec(int optc, int mini, int maxi) { - return argvalint(index, mini, maxi, 10); + return argvalint(optc, mini, maxi, 10); } -static void noarg(int index) +static void noarg(int optc) { if (optarg != 0) { - ERROR("option [--%s] need no value (found %s)", cliOptions[index].name, optarg); + ERROR("option [--%s] need no value (found %s)", name_of_option(optc), optarg); exit(1); } } @@ -328,7 +400,6 @@ static void noarg(int index) static void parse_arguments(int argc, char **argv, struct afb_config *config) { char *programName = argv[0]; - int optionIndex = 0; int optc, ind; int nbcmd; struct option *gnuOptions; @@ -346,7 +417,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) } // get all options from command line - while ((optc = getopt_long(argc, argv, SHORTOPTS, gnuOptions, &optionIndex)) != EOF) { + while ((optc = getopt_long(argc, argv, shortopts, gnuOptions, NULL)) != EOF) { switch (optc) { case SET_VERBOSE: verbosity++; @@ -357,105 +428,139 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) break; case SET_TCP_PORT: - config->httpdPort = argvalintdec(optionIndex, 1024, 32767); + config->httpdPort = argvalintdec(optc, 1024, 32767); break; case SET_APITIMEOUT: - config->apiTimeout = argvalintdec(optionIndex, 0, INT_MAX); + config->apiTimeout = argvalintdec(optc, 0, INT_MAX); break; case SET_CNTXTIMEOUT: - config->cntxTimeout = argvalintdec(optionIndex, 0, INT_MAX); + config->cntxTimeout = argvalintdec(optc, 0, INT_MAX); break; case SET_ROOT_DIR: - config->rootdir = argvalstr(optionIndex); + config->rootdir = argvalstr(optc); INFO("Forcing Rootdir=%s", config->rootdir); break; case SET_ROOT_HTTP: - config->roothttp = argvalstr(optionIndex); + config->roothttp = argvalstr(optc); INFO("Forcing Root HTTP=%s", config->roothttp); break; case SET_ROOT_BASE: - config->rootbase = argvalstr(optionIndex); + config->rootbase = argvalstr(optc); INFO("Forcing Rootbase=%s", config->rootbase); break; case SET_ROOT_API: - config->rootapi = argvalstr(optionIndex); + config->rootapi = argvalstr(optc); INFO("Forcing Rootapi=%s", config->rootapi); break; case SET_ALIAS: - list_add(&config->aliases, argvalstr(optionIndex)); + list_add(&config->aliases, argvalstr(optc)); break; case SET_AUTH_TOKEN: - config->token = argvalstr(optionIndex); + config->token = argvalstr(optc); break; case SET_LDPATH: - list_add(&config->ldpaths, argvalstr(optionIndex)); + list_add(&config->ldpaths, argvalstr(optc)); + break; + + case SET_WEAK_LDPATH: + list_add(&config->weak_ldpaths, argvalstr(optc)); + break; + + case NO_LDPATH: + noarg(optc); + config->no_ldpaths = 1; + break; + + case ADD_CALL: + list_add(&config->calls, argvalstr(optc)); break; case SET_SESSION_DIR: - config->sessiondir = argvalstr(optionIndex); + /* config->sessiondir = argvalstr(optc); */ + WARNING("Obsolete option %s ignored", name_of_option(optc)); + break; + + case SET_UPLOAD_DIR: + config->uploaddir = argvalstr(optc); + break; + + case SET_WORK_DIR: + config->workdir = argvalstr(optc); break; case SET_CACHE_TIMEOUT: - config->cacheTimeout = argvalintdec(optionIndex, 0, INT_MAX); + config->cacheTimeout = argvalintdec(optc, 0, INT_MAX); break; case SET_SESSIONMAX: - config->nbSessionMax = argvalintdec(optionIndex, 1, INT_MAX); + config->nbSessionMax = argvalintdec(optc, 1, INT_MAX); break; case SET_FORGROUND: - noarg(optionIndex); + noarg(optc); config->background = 0; break; case SET_BACKGROUND: - noarg(optionIndex); + noarg(optc); config->background = 1; break; - case SET_MODE: - config->mode = argvalenum(optionIndex, mode_desc); + case SET_NAME: + config->name = argvalstr(optc); break; - case SET_READYFD: - config->readyfd = argvalintdec(optionIndex, 0, INT_MAX); + case SET_MODE: + config->mode = argvalenum(optc, mode_desc); break; case DBUS_CLIENT: - list_add(&config->dbus_clients, argvalstr(optionIndex)); + list_add(&config->dbus_clients, argvalstr(optc)); break; case DBUS_SERVICE: - list_add(&config->dbus_servers, argvalstr(optionIndex)); + list_add(&config->dbus_servers, argvalstr(optc)); break; case WS_CLIENT: - list_add(&config->ws_clients, argvalstr(optionIndex)); + list_add(&config->ws_clients, argvalstr(optc)); break; case WS_SERVICE: - list_add(&config->ws_servers, argvalstr(optionIndex)); + list_add(&config->ws_servers, argvalstr(optc)); break; case SO_BINDING: - list_add(&config->so_bindings, argvalstr(optionIndex)); + list_add(&config->so_bindings, argvalstr(optc)); break; case SET_TRACEREQ: - config->tracereq = argvalenum(optionIndex, tracereq_desc); + config->tracereq = argvalenum(optc, tracereq_desc); + break; + + case SET_TRACEDITF: + config->traceditf = argvalenum(optc, traceditf_desc); + break; + + case SET_TRACESVC: + config->tracesvc = argvalenum(optc, tracesvc_desc); + break; + + case SET_TRACEEVT: + config->traceevt = argvalenum(optc, traceevt_desc); break; case SET_NO_HTTPD: - noarg(optionIndex); + noarg(optc); config->noHttpd = 1; break; @@ -464,8 +569,18 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) optind = argc; break; + case SET_RNDTOKEN: + config->random_token = 1; + break; + +#if defined(WITH_MONITORING_OPTION) + case SET_MONITORING: + config->monitoring = 1; + break; +#endif + case DISPLAY_VERSION: - noarg(optionIndex); + noarg(optc); printVersion(stdout); exit(0); @@ -480,8 +595,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) free(gnuOptions); } -// load config from disk and merge with CLI option -static void config_set_default(struct afb_config *config) +static void fulfill_config(struct afb_config *config) { // default HTTP port if (config->httpdPort == 0) @@ -492,8 +606,8 @@ static void config_set_default(struct afb_config *config) config->apiTimeout = DEFLT_API_TIMEOUT; // default AUTH_TOKEN - if (config->token == NULL) - config->token = DEFLT_AUTH_TOKEN; + if (config->random_token) + config->token = NULL; // cache timeout default one hour if (config->cacheTimeout == 0) @@ -507,14 +621,16 @@ static void config_set_default(struct afb_config *config) if (config->nbSessionMax == 0) config->nbSessionMax = CTX_NBCLIENTS; - if (config->rootdir == NULL) { - config->rootdir = getenv("AFBDIR"); - if (config->rootdir == NULL) { - config->rootdir = malloc(512); - strncpy(config->rootdir, getenv("HOME"), 512); - strncat(config->rootdir, "/.AFB", 512); - } - } + /* set directories */ + if (config->workdir == NULL) + config->workdir = "."; + + if (config->rootdir == NULL) + config->rootdir = "."; + + if (config->uploaddir == NULL) + config->uploaddir = "."; + // if no Angular/HTML5 rootbase let's try '/' as default if (config->rootbase == NULL) config->rootbase = "/opa"; @@ -522,19 +638,18 @@ static void config_set_default(struct afb_config *config) if (config->rootapi == NULL) config->rootapi = "/api"; - if (config->ldpaths == NULL) + if (config->ldpaths == NULL && config->weak_ldpaths == NULL && !config->no_ldpaths) list_add(&config->ldpaths, BINDING_INSTALL_DIR); - // if no session dir create a default path from rootdir - if (config->sessiondir == NULL) { - config->sessiondir = malloc(512); - strncpy(config->sessiondir, config->rootdir, 512); - strncat(config->sessiondir, "/sessions", 512); - } - // if no config dir create a default path from sessiondir +#if defined(WITH_MONITORING_OPTION) + if (config->monitoring) + list_add(&config->aliases, strdup("/monitoring:"BINDING_INSTALL_DIR"/monitoring")); +#endif + + // if no config dir create a default path from uploaddir if (config->console == NULL) { config->console = malloc(512); - strncpy(config->console, config->sessiondir, 512); + strncpy(config->console, config->uploaddir, 512); strncat(config->console, "/AFB-console.out", 512); } } @@ -563,8 +678,10 @@ void afb_config_dump(struct afb_config *config) S(roothttp) S(rootbase) S(rootapi) - S(sessiondir) + S(workdir) + S(uploaddir) S(token) + S(name) L(aliases) L(dbus_clients) @@ -573,19 +690,28 @@ void afb_config_dump(struct afb_config *config) L(ws_servers) L(so_bindings) L(ldpaths) + L(weak_ldpaths) + L(calls) V(exec) D(httpdPort) - B(background) - D(readyfd) 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) + + B(no_ldpaths) B(noHttpd) + B(background) + B(monitoring) + B(random_token) P("---END-OF-CONFIG---\n"); #undef V @@ -608,7 +734,7 @@ struct afb_config *afb_config_parse_arguments(int argc, char **argv) result = calloc(1, sizeof *result); parse_arguments(argc, argv, result); - config_set_default(result); + fulfill_config(result); if (verbosity >= 3) afb_config_dump(result); return result;