X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=016da835c1835f7219bd8980a98d43cbbf230447;hb=48ecf6eed5091bdb4788da0112870e79d58baf19;hp=efa86f23f277a46d9be491c762272c97130ea848;hpb=7e15e18817554d1a007d6857504224cdef37b939;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index efa86f23..016da835 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -16,7 +16,6 @@ */ #define _GNU_SOURCE -#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO #include #include @@ -25,8 +24,6 @@ #include #include -#include - #include "verbose.h" #include "afb-config.h" #include "afb-hook.h" @@ -36,8 +33,9 @@ #if !defined(BINDING_INSTALL_DIR) #error "you should define BINDING_INSTALL_DIR" #endif - -#define AFB_VERSION "0.6" +#if !defined(AFB_VERSION) +#error "you should define AFB_VERSION" +#endif // default #define DEFLT_CNTX_TIMEOUT 3600 // default Client Connection @@ -47,7 +45,6 @@ #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 @@ -56,7 +53,6 @@ #define SET_BACKGROUND 2 #define SET_FORGROUND 3 -#define SET_TCP_PORT 5 #define SET_ROOT_DIR 6 #define SET_ROOT_BASE 7 #define SET_ROOT_API 8 @@ -91,6 +87,11 @@ #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' @@ -101,7 +102,12 @@ #define SET_VERBOSE 'v' #define SET_WORK_DIR 'w' -#define SHORTOPTS "c:D:E:ehqrT:t:u:Vvw:" +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 { @@ -120,6 +126,8 @@ 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_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]"}, @@ -141,7 +149,7 @@ static AFB_options cliOptions[] = { {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","Creates a random token"}, + {SET_RNDTOKEN, 0, "random-token","Enforce a random token"}, {DISPLAY_VERSION, 0, "version", "Display version and copyright"}, {DISPLAY_HELP, 0, "help", "Display this help"}, @@ -165,6 +173,9 @@ static AFB_options cliOptions[] = { {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* */ }; @@ -219,14 +230,16 @@ static struct enumdesc mode_desc[] = { +--------------------------------------------------------- */ static void printVersion(FILE * file) { - fprintf(file, "\n----------------------------------------- \n"); - fprintf(file, " AFB [Application Framework Binder] version=%s |\n", - AFB_VERSION); - fprintf(file, " \n"); - fprintf(file, - " Copyright (C) 2015, 2016, 2017 \"IoT.bzh\" [fulup -at- iot.bzh]\n"); - fprintf(file, " AFB comes with ABSOLUTELY NO WARRANTY.\n"); - fprintf(file, " Licence Apache 2\n\n"); + static const char version[] = + "\n" + " AFB [Application Framework Binder] version="AFB_VERSION"\n" + "\n" + " Copyright (C) 2015, 2016, 2017 \"IoT.bzh\"\n" + " AFB comes with ABSOLUTELY NO WARRANTY.\n" + " Licence Apache 2\n" + "\n"; + + fprintf(file, "%s", version); } /*---------------------------------------------------------- @@ -252,18 +265,6 @@ static void printHelp(FILE * file, const char *name) } -/*---------------------------------------------------------- - | adds a string to the list - +--------------------------------------------------------- */ -static char *random_token() -{ - static char uuidstr[37]; - uuid_t uuid; - uuid_generate_random(uuid); - uuid_unparse(uuid, uuidstr); - return uuidstr; -} - /*---------------------------------------------------------- | adds a string to the list +--------------------------------------------------------- */ @@ -394,6 +395,31 @@ static void noarg(int optc) } } +static char **make_exec(char **argv) +{ + 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); + } + + 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; +} + /*--------------------------------------------------------- | Parse option and launch action +--------------------------------------------------------- */ @@ -418,7 +444,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, NULL)) != EOF) { + while ((optc = getopt_long(argc, argv, shortopts, gnuOptions, NULL)) != EOF) { switch (optc) { case SET_VERBOSE: verbosity++; @@ -487,7 +513,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) case SET_SESSION_DIR: /* config->sessiondir = argvalstr(optc); */ - WARNING("Obsolete otpion %s ignored", name_of_option(optc)); + WARNING("Obsolete option %s ignored", name_of_option(optc)); break; case SET_UPLOAD_DIR: @@ -516,6 +542,10 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) config->background = 1; break; + case SET_NAME: + config->name = argvalstr(optc); + break; + case SET_MODE: config->mode = argvalenum(optc, mode_desc); break; @@ -562,14 +592,20 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) break; case SET_EXEC: - config->exec = &argv[optind]; - optind = argc; + config->exec = make_exec(&argv[optind]); + optind = argc; /* stop option scanning */ break; case SET_RNDTOKEN: - config->token = random_token(); + config->random_token = 1; break; +#if defined(WITH_MONITORING_OPTION) + case SET_MONITORING: + config->monitoring = 1; + break; +#endif + case DISPLAY_VERSION: noarg(optc); printVersion(stdout); @@ -586,8 +622,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) @@ -598,8 +633,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) @@ -633,6 +668,11 @@ static void config_set_default(struct afb_config *config) 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->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); @@ -668,6 +708,7 @@ void afb_config_dump(struct afb_config *config) S(workdir) S(uploaddir) S(token) + S(name) L(aliases) L(dbus_clients) @@ -676,20 +717,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(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 @@ -712,7 +761,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;