X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-args.c;h=9d15608820b22c4afbac4155b91af0c84623ebda;hb=f3d1f19ae308cc0559728c0ccf6281cbce5ee37c;hp=ed14a73186cb932be3972494bdd094c47daa8bc6;hpb=d00bfe9410cfcaeb247ba68a88144defb5184ac9;p=src%2Fapp-framework-binder.git diff --git a/src/afb-args.c b/src/afb-args.c index ed14a731..9d156088 100644 --- a/src/afb-args.c +++ b/src/afb-args.c @@ -119,6 +119,7 @@ #define SET_DAEMON 'D' #define SET_EXEC 'e' #define GET_HELP 'h' +#define ADD_INTERFACE 'i' #define SET_LOG 'l' #if defined(WITH_MONITORING_OPTION) #define SET_MONITORING 'M' @@ -158,7 +159,8 @@ static struct option_desc optdefs[] = { {SET_NAME, 1, "name", "Set the visible name"}, - {SET_PORT, 1, "port", "HTTP listening TCP port [default " d2s(DEFAULT_HTTP_PORT) "]"}, + {SET_PORT, 1, "port", "HTTP listening TCP port of all interfaces [default " d2s(DEFAULT_HTTP_PORT) "]"}, + {ADD_INTERFACE, 1, "interface", "Add HTTP listening interface (ex: tcp:localhost:8080)"}, {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]"}, {SET_ROOT_API, 1, "rootapi", "HTML Root API URL [default /api]"}, @@ -241,7 +243,6 @@ static const struct { int optid; int valdef; } default_optint_values[] = { - { SET_PORT, DEFAULT_HTTP_PORT }, { SET_API_TIMEOUT, DEFAULT_API_TIMEOUT }, { SET_CACHE_TIMEOUT, DEFAULT_CACHE_TIMEOUT }, { SET_SESSION_TIMEOUT, DEFAULT_SESSION_TIMEOUT }, @@ -366,7 +367,7 @@ static void printVersion(FILE * file) #endif "HOOK " -#if WITH_TRACE +#if WITH_AFB_TRACE "+" #else "-" @@ -375,29 +376,21 @@ static void printVersion(FILE * file) "[" #if WITH_DYNAMIC_BINDING - "BINDINGS " "+" #else "-" #endif + "BINDINGS " #if WITH_LEGACY_BINDING_V1 - "+" -#else - "-" + "+V1 " #endif - "V1 " #if WITH_LEGACY_BINDING_VDYN - "+" -#else - "-" + "+VDYN " #endif - "VDYN " #if WITH_LEGACY_BINDING_V2 - "+" -#else - "-" + "+V2 " #endif - "V2 +V3]\n" + "+V3]\n" "\n", AFB_VERSION ); @@ -849,6 +842,7 @@ static void parse_arguments_inner(int argc, char **argv, struct json_object *con case ADD_WS_CLIENT: case ADD_WS_SERVICE: case ADD_AUTO_API: + case ADD_INTERFACE: config_add_optstr(config, optid); break; @@ -993,6 +987,9 @@ static void fulfill_config(struct json_object *config) if (!config_has(config, default_optstr_values[i].optid)) config_set_str(config, default_optstr_values[i].optid, default_optstr_values[i].valdef); + if (!config_has(config, SET_PORT) && !config_has(config, ADD_INTERFACE) && !config_has_bool(config, SET_NO_HTTPD)) + config_set_int(config, SET_PORT, DEFAULT_HTTP_PORT); + // default AUTH_TOKEN if (config_has_bool(config, SET_RANDOM_TOKEN)) config_del(config, SET_TOKEN);