X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=f4aed0550a4969b5257fe8396d009f46d9daa594;hb=b0c0093229eea9aabed1385cc9f4c5a27a7c0a87;hp=b11f8a1064752fa88ac1132d6654ddee93afc3aa;hpb=df098f275a09531fc545b2e1195c80d52a27656d;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index b11f8a10..f4aed055 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 @@ -34,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 @@ -87,9 +87,10 @@ #define SET_TRACEEVT 'E' #define SET_EXEC 'e' #define DISPLAY_HELP 'h' -#if defined(WITH_MONITORING_OTPION) +#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' @@ -102,8 +103,8 @@ #define SET_WORK_DIR 'w' const char shortopts[] = - "c:D:E:ehp:qrT:t:u:Vvw:" -#if defined(WITH_MONITORING_OTPION) + "c:D:E:ehn:p:qrT:t:u:Vvw:" +#if defined(WITH_MONITORING_OPTION) "M" #endif ; @@ -125,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]"}, @@ -170,8 +173,8 @@ 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_OTPION) - {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at /monitoring/monitor.html"}, +#if defined(WITH_MONITORING_OPTION) + {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at /monitoring/"}, #endif {0, 0, NULL, NULL} /* *INDENT-ON* */ @@ -227,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); } /*---------------------------------------------------------- @@ -390,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 +--------------------------------------------------------- */ @@ -483,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: @@ -512,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; @@ -558,15 +592,15 @@ 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->random_token = 1; break; -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) case SET_MONITORING: config->monitoring = 1; break; @@ -634,7 +668,7 @@ static void fulfill_config(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_OTPION) +#if defined(WITH_MONITORING_OPTION) if (config->monitoring) list_add(&config->aliases, strdup("/monitoring:"BINDING_INSTALL_DIR"/monitoring")); #endif @@ -674,6 +708,7 @@ void afb_config_dump(struct afb_config *config) S(workdir) S(uploaddir) S(token) + S(name) L(aliases) L(dbus_clients) @@ -682,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 @@ -711,12 +754,47 @@ void afb_config_dump(struct afb_config *config) #undef NN } +static void on_environment_list(struct afb_config_list **to, const char *name) +{ + char *value = getenv(name); + + if (value) + list_add(to, value); +} + +static void on_environment_enum(int *to, const char *name, struct enumdesc *desc) +{ + char *value = getenv(name); + + 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); + } +} + +static void parse_environment(struct afb_config *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_list(&config->ldpaths, "AFB_LDPATHS"); +} + struct afb_config *afb_config_parse_arguments(int argc, char **argv) { struct afb_config *result; result = calloc(1, sizeof *result); + parse_environment(result); parse_arguments(argc, argv, result); fulfill_config(result); if (verbosity >= 3)