X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=6c77c1db3e0d237cd335d448c60806456339fd1f;hb=ac7a95223a6314cca6250495ea59c3cf7e46e89e;hp=7e2cb40507b276c44516c91dc586c2d21d3d8575;hpb=350f165da982685f2ea7c6d0899e9711b2c35982;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index 7e2cb405..6c77c1db 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -24,6 +24,8 @@ #include #include +#include + #include "verbose.h" #include "afb-config.h" #include "afb-hook.h" @@ -38,8 +40,8 @@ #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 @@ -95,6 +97,7 @@ #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_UPLOAD_DIR 'u' @@ -103,7 +106,7 @@ #define SET_WORK_DIR 'w' const char shortopts[] = - "c:D:E:ehn:p:qrT:t:u:Vvw:" + "c:D:E:ehn:p:qrS:s:T:t:u:Vvw:" #if defined(WITH_MONITORING_OPTION) "M" #endif @@ -167,6 +170,7 @@ static AFB_options cliOptions[] = { {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"}, {ADD_CALL, 1, "call", "call at start format of val: API/VERB:json-args"}, @@ -217,6 +221,13 @@ static struct enumdesc traceevt_desc[] = { { NULL, 0 } }; +static struct enumdesc traceses_desc[] = { + { "no", 0 }, + { "common", afb_hook_flags_session_common }, + { "all", afb_hook_flags_session_all }, + { NULL, 0 } +}; + static struct enumdesc mode_desc[] = { { "local", AFB_MODE_LOCAL }, { "remote", AFB_MODE_REMOTE }, @@ -586,6 +597,10 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) 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; @@ -693,7 +708,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);} @@ -733,11 +747,14 @@ void afb_config_dump(struct afb_config *config) E(traceditf,traceditf_desc) E(tracesvc,tracesvc_desc) E(traceevt,traceevt_desc) + E(traceses,traceses_desc) B(no_ldpaths) B(noHttpd) B(background) +#if defined(WITH_MONITORING_OPTION) B(monitoring) +#endif B(random_token) P("---END-OF-CONFIG---\n"); @@ -745,7 +762,6 @@ void afb_config_dump(struct afb_config *config) #undef E #undef L #undef B -#undef H #undef D #undef S #undef PE @@ -785,6 +801,7 @@ static void parse_environment(struct afb_config *config) 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"); } @@ -802,3 +819,95 @@ 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) + E(traceses,traceses_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; +} +