X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=58c0d8ec2a9800de7ab914c62e6f254808fd02e8;hb=36e53e878baaa9d56c09097ada0b7061266caff8;hp=c474fafa0e95fe423320b1b6e0d8265f74867a99;hpb=bbddc1e584dd01b60042f622f8cecfc69361020b;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index c474fafa..58c0d8ec 100644 --- a/src/main.c +++ b/src/main.c @@ -34,13 +34,16 @@ #include "afb-apis.h" #include "afb-api-so.h" #include "afb-api-dbus.h" +#include "afb-api-ws.h" #include "afb-hsrv.h" #include "afb-context.h" #include "afb-hreq.h" #include "afb-sig-handler.h" +#include "afb-thread.h" #include "session.h" #include "verbose.h" #include "afb-common.h" +#include "afb-hook.h" #include @@ -48,6 +51,11 @@ #error "you should define BINDING_INSTALL_DIR" #endif +#define TRACEREQ_NO 0 +#define TRACEREQ_COMMON 1 +#define TRACEREQ_EXTRA 2 +#define TRACEREQ_ALL 3 + #define AFB_VERSION "0.5" // Define command line option @@ -81,6 +89,13 @@ #define SET_SESSIONMAX 23 +#define WS_CLIENT 24 +#define WS_SERVICE 25 + +#define SET_ROOT_HTTP 26 + +#define SET_TRACEREQ 27 + // Command line structure hold cli --command + help text typedef struct { int val; // command number within application @@ -92,13 +107,14 @@ typedef struct { // Supported option static AFB_options cliOptions [] = { - {SET_VERBOSE ,0,"verbose" , "Verbose Mode"}, + {SET_VERBOSE ,0,"verbose" , "Verbose Mode, repeat to increase verbosity"}, {SET_FORGROUND ,0,"foreground" , "Get all in foreground mode"}, {SET_BACKGROUND ,0,"daemon" , "Get all in background mode"}, {SET_TCP_PORT ,1,"port" , "HTTP listening TCP port [default 1234]"}, - {SET_ROOT_DIR ,1,"rootdir" , "HTTP Root Directory [default $HOME/.AFB]"}, + {SET_ROOT_DIR ,1,"rootdir" , "Root Directory [default $HOME/.AFB]"}, + {SET_ROOT_HTTP ,1,"roothttp" , "HTTP Root Directory [default rootdir]"}, {SET_ROOT_BASE ,1,"rootbase" , "Angular Base Root URL [default /opa]"}, {SET_ROOT_API ,1,"rootapi" , "HTML Root API URL [default /api]"}, {SET_ALIAS ,1,"alias" , "Muliple url map outside of rootdir [eg: --alias=/icons:/usr/share/icons]"}, @@ -120,10 +136,14 @@ static AFB_options cliOptions [] = { {DBUS_CLIENT ,1,"dbus-client" , "bind to an afb service through dbus"}, {DBUS_SERVICE ,1,"dbus-server" , "provides an afb service through dbus"}, + {WS_CLIENT ,1,"ws-client" , "bind to an afb service through websocket"}, + {WS_SERVICE ,1,"ws-server" , "provides an afb service through websockets"}, {SO_BINDING ,1,"binding" , "load the binding of path"}, {SET_SESSIONMAX ,1,"session-max" , "max count of session simultaneously [default 10]"}, + {SET_TRACEREQ ,1,"tracereq" , "log the requests: no, common, extra, all"}, + {0, 0, NULL, NULL} }; @@ -206,6 +226,9 @@ static void config_set_default (struct afb_config * config) } // if no Angular/HTML5 rootbase let's try '/' as default + if (config->roothttp == NULL) + config->roothttp = "."; + if (config->rootbase == NULL) config->rootbase = "/opa"; @@ -306,6 +329,12 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) INFO("Forcing Rootdir=%s",config->rootdir); break; + case SET_ROOT_HTTP: + if (optarg == 0) goto needValueForOption; + config->roothttp = optarg; + INFO("Forcing Root HTTP=%s",config->roothttp); + break; + case SET_ROOT_BASE: if (optarg == 0) goto needValueForOption; config->rootbase = optarg; @@ -384,11 +413,22 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) case DBUS_CLIENT: case DBUS_SERVICE: + case WS_CLIENT: + case WS_SERVICE: case SO_BINDING: if (optarg == 0) goto needValueForOption; add_item(config, optc, optarg); break; + case SET_TRACEREQ: + if (optarg == 0) goto needValueForOption; + if (!strcmp(optarg, "no")) config->tracereq = TRACEREQ_NO; + else if (!strcmp(optarg, "common")) config->tracereq = TRACEREQ_COMMON; + else if (!strcmp(optarg, "extra")) config->tracereq = TRACEREQ_EXTRA; + else if (!strcmp(optarg, "all")) config->tracereq = TRACEREQ_ALL; + else goto badMode; + break; + case DISPLAY_VERSION: if (optarg != 0) goto noValueForOption; printVersion(stdout); @@ -484,7 +524,9 @@ static void daemonize(struct afb_config *config) +--------------------------------------------------------- */ static int init_http_server(struct afb_hsrv *hsrv, struct afb_config * config) { - int idx; + int idx, dfd; + + dfd = afb_common_rootdir_get_fd(); if (!afb_hsrv_add_handler(hsrv, config->rootapi, afb_hswitch_websocket_switch, NULL, 20)) return 0; @@ -493,10 +535,10 @@ static int init_http_server(struct afb_hsrv *hsrv, struct afb_config * config) return 0; for (idx = 0; idx < config->aliascount; idx++) - if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, config->aliasdir[idx].path, 0, 0)) + if (!afb_hsrv_add_alias (hsrv, config->aliasdir[idx].url, dfd, config->aliasdir[idx].path, 0, 0)) return 0; - if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10, 1)) + if (!afb_hsrv_add_alias(hsrv, "", dfd, config->roothttp, -10, 1)) return 0; if (!afb_hsrv_add_handler(hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20)) @@ -559,6 +601,18 @@ static void start_items(struct afb_config_item *item) exit(1); } break; + case WS_CLIENT: + if (afb_api_ws_add_client(item->value) < 0) { + ERROR("can't start the afb-websocket client of path %s",item->value); + exit(1); + } + break; + case WS_SERVICE: + if (afb_api_ws_add_server(item->value) < 0) { + ERROR("can't start the afb-websocket service of path %s",item->value); + exit(1); + } + break; case SO_BINDING: if (afb_api_so_add_binding(item->value) < 0) { ERROR("can't start the binding of path %s",item->value); @@ -616,7 +670,17 @@ int main(int argc, char *argv[]) { } if (afb_sig_handler_init() < 0) { - ERROR("main fail to initialise signal handlers"); + ERROR("failed to initialise signal handlers"); + return 1; + } + + if (afb_common_rootdir_set(config->rootdir) < 0) { + ERROR("failed to set common root directory"); + return 1; + } + + if (afb_thread_init(3, 1, 20) < 0) { + ERROR("failed to initialise threading"); return 1; } @@ -639,6 +703,26 @@ int main(int argc, char *argv[]) { INFO("entering foreground mode"); } + /* ignore any SIGPIPE */ + signal(SIGPIPE, SIG_IGN); + + /* install trace of requests */ + switch(config->tracereq) { + default: + case TRACEREQ_NO: + break; + case TRACEREQ_COMMON: + afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_common, NULL, NULL); + break; + case TRACEREQ_EXTRA: + afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_extra, NULL, NULL); + break; + case TRACEREQ_ALL: + afb_hook_req_create(NULL, NULL, NULL, afb_hook_flags_req_all, NULL, NULL); + break; + } + + /* start the HTTP server */ hsrv = start_http_server(config); if (hsrv == NULL) exit(1);