X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-config.c;h=2a6f931f66f0aa7506351d4cfab7d8cfb2ca08e9;hb=refs%2Fchanges%2F23%2F14323%2F1;hp=fc3f5d7033f6bd8bbd6eb06e618d6954da2069bf;hpb=96ee1e30743b88780cc9dc975745d8dc03de25ae;p=src%2Fapp-framework-binder.git diff --git a/src/afb-config.c b/src/afb-config.c index fc3f5d70..2a6f931f 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016, 2017 "IoT.bzh" + * Copyright (C) 2015-2018 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,6 +39,18 @@ #error "you should define AFB_VERSION" #endif +/* set the HAS_ options */ +#if defined(WITH_MONITORING_OPTION) +# define HAS_MONITORING 1 +#else +# define HAS_MONITORING 0 +#endif +#if defined(WITH_DBUS_TRANSPARENCY) +# define HAS_DBUS 1 +#else +# define HAS_DBUS 0 +#endif + // default #define DEFLT_CNTX_TIMEOUT 32000000 // default Client Connection // Timeout: few more than one year @@ -71,8 +83,11 @@ #define SET_MODE 18 -#define DBUS_CLIENT 20 -#define DBUS_SERVICE 21 +#if HAS_DBUS +# define DBUS_CLIENT 20 +# define DBUS_SERVICE 21 +#endif + #define SO_BINDING 22 #define SET_SESSIONMAX 23 @@ -89,14 +104,15 @@ #define SET_TRACEEVT 'E' #define SET_EXEC 'e' #define DISPLAY_HELP 'h' -#if defined(WITH_MONITORING_OPTION) -#define SET_MONITORING 'M' +#if HAS_MONITORING +# 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_TRACESES 's' #define SET_TRACEREQ 'T' #define SET_AUTH_TOKEN 't' #define SET_UPLOAD_DIR 'u' @@ -105,8 +121,8 @@ #define SET_WORK_DIR 'w' const char shortopts[] = - "c:D:E:ehn:p:qrT:t:u:Vvw:" -#if defined(WITH_MONITORING_OPTION) + "c:D:E:ehn:p:qrS:s:T:t:u:Vvw:" +#if HAS_MONITORING "M" #endif ; @@ -158,8 +174,10 @@ static AFB_options cliOptions[] = { {SET_MODE, 1, "mode", "Set the mode: either local, remote or global"}, +#if HAS_DBUS {DBUS_CLIENT, 1, "dbus-client", "Bind to an afb service through dbus"}, {DBUS_SERVICE, 1, "dbus-server", "Provides an afb service through dbus"}, +#endif {WS_CLIENT, 1, "ws-client", "Bind to an afb service through websocket"}, {WS_SERVICE, 1, "ws-server", "Provides an afb service through websockets"}, @@ -169,13 +187,14 @@ 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"}, {SET_NO_HTTPD, 0, "no-httpd", "Forbids HTTP service"}, {SET_EXEC, 0, "exec", "Execute the remaining arguments"}, -#if defined(WITH_MONITORING_OPTION) +#if HAS_MONITORING {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at /monitoring/"}, #endif {0, 0, NULL, NULL} @@ -219,6 +238,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 }, @@ -232,16 +258,20 @@ static struct enumdesc mode_desc[] = { +--------------------------------------------------------- */ static void printVersion(FILE * file) { - static const char version[] = - "\n" - " AFB [Application Framework Binder] version="AFB_VERSION"\n" + static char pm[2] = { '-', '+' }; + fprintf(file, "\n" - " Copyright (C) 2015, 2016, 2017 \"IoT.bzh\"\n" + " AGL Framework Binder [AFB %s] %cDBUS %cMONITOR\n" + "\n", + AFB_VERSION, + pm[HAS_DBUS], + pm[HAS_MONITORING] + ); + fprintf(file, + " Copyright (C) 2015-2018 \"IoT.bzh\"\n" " AFB comes with ABSOLUTELY NO WARRANTY.\n" " Licence Apache 2\n" - "\n"; - - fprintf(file, "%s", version); + "\n"); } /*---------------------------------------------------------- @@ -552,6 +582,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) config->mode = argvalenum(optc, mode_desc); break; +#if HAS_DBUS case DBUS_CLIENT: list_add(&config->dbus_clients, argvalstr(optc)); break; @@ -559,6 +590,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) case DBUS_SERVICE: list_add(&config->dbus_servers, argvalstr(optc)); break; +#endif case WS_CLIENT: list_add(&config->ws_clients, argvalstr(optc)); @@ -588,6 +620,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; @@ -602,7 +638,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) config->random_token = 1; break; -#if defined(WITH_MONITORING_OPTION) +#if HAS_MONITORING case SET_MONITORING: config->monitoring = 1; break; @@ -670,7 +706,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_OPTION) +#if HAS_MONITORING if (config->monitoring) list_add(&config->aliases, strdup("/monitoring:"BINDING_INSTALL_DIR"/monitoring")); #endif @@ -712,8 +748,10 @@ void afb_config_dump(struct afb_config *config) S(name) L(aliases) +#if HAS_DBUS L(dbus_clients) L(dbus_servers) +#endif L(ws_clients) L(ws_servers) L(so_bindings) @@ -734,11 +772,12 @@ 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) +#if HAS_MONITORING B(monitoring) #endif B(random_token) @@ -787,6 +826,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"); } @@ -842,8 +882,10 @@ struct json_object *afb_config_json(struct afb_config *config) S(name) L(aliases) +#if HAS_DBUS L(dbus_clients) L(dbus_servers) +#endif L(ws_clients) L(ws_servers) L(so_bindings) @@ -864,11 +906,12 @@ struct json_object *afb_config_json(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) +#if HAS_MONITORING B(monitoring) #endif B(random_token)