X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=fc3f5d7033f6bd8bbd6eb06e618d6954da2069bf;hb=6e7f3d28a2d08a8976fdd9c586b4cbddcaeb37bd;hp=d906bcb719c30ef6b68a6a7bf10f5dd3bfc3f38e;hpb=9bc48026a93e8330a2bd2795e78d5951c16b7d33;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index d906bcb7..fc3f5d70 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,6 +24,8 @@ #include #include +#include + #include "verbose.h" #include "afb-config.h" #include "afb-hook.h" @@ -34,12 +35,13 @@ #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 - // Timeout +#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 @@ -148,7 +150,7 @@ static AFB_options cliOptions[] = { {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_AUTH_TOKEN, 1, "token", "Initial Secret [default=random, use --token="" to allow any token]"}, {SET_RNDTOKEN, 0, "random-token","Enforce a random token"}, {DISPLAY_VERSION, 0, "version", "Display version and copyright"}, @@ -230,14 +232,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); } /*---------------------------------------------------------- @@ -393,6 +397,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 +--------------------------------------------------------- */ @@ -565,8 +594,8 @@ 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: @@ -666,7 +695,6 @@ void afb_config_dump(struct afb_config *config) #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 H(x) PF(x);P("%x",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);} @@ -710,7 +738,9 @@ void afb_config_dump(struct afb_config *config) B(no_ldpaths) B(noHttpd) B(background) +#if defined(WITH_MONITORING_OPTION) B(monitoring) +#endif B(random_token) P("---END-OF-CONFIG---\n"); @@ -718,7 +748,6 @@ void afb_config_dump(struct afb_config *config) #undef E #undef L #undef B -#undef H #undef D #undef S #undef PE @@ -727,12 +756,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) @@ -740,3 +804,94 @@ struct afb_config *afb_config_parse_arguments(int argc, char **argv) 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) + L(dbus_clients) + L(dbus_servers) + 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) + + B(no_ldpaths) + B(noHttpd) + B(background) +#if defined(WITH_MONITORING_OPTION) + 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; +} +