X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=28b452c2168472d8d7e2ade8914134c42efd8a4b;hb=dc011f99aed9407c8319b1b70a81f56ad2f02bc8;hp=124d7e4478743d9b916ec3da27c43d9f67e53bd7;hpb=b5cf93aed93e7f331eb645c8afe5317fb67ee50e;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index 124d7e44..28b452c2 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2015 "IoT.bzh" +/* + * Copyright (C) 2015, 2016 "IoT.bzh" * Author "Fulup Ar Foll" * Author José Bollo * @@ -17,6 +17,7 @@ */ #define _GNU_SOURCE +#define NO_BINDING_VERBOSE_MACRO #include #include @@ -33,6 +34,7 @@ #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" @@ -41,13 +43,13 @@ #include "verbose.h" #include "afb-common.h" -#include "afb-plugin.h" +#include -#if !defined(PLUGIN_INSTALL_DIR) -#error "you should define PLUGIN_INSTALL_DIR" +#if !defined(BINDING_INSTALL_DIR) +#error "you should define BINDING_INSTALL_DIR" #endif -#define AFB_VERSION "0.4" +#define AFB_VERSION "0.5" // Define command line option #define SET_VERBOSE 1 @@ -76,7 +78,14 @@ #define DBUS_CLIENT 20 #define DBUS_SERVICE 21 -#define SO_PLUGIN 22 +#define SO_BINDING 22 + +#define SET_SESSIONMAX 23 + +#define WS_CLIENT 24 +#define WS_SERVICE 25 + +#define SET_ROOT_HTTP 26 // Command line structure hold cli --command + help text typedef struct { @@ -95,20 +104,21 @@ static AFB_options cliOptions [] = { {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]"}, - - {SET_APITIMEOUT ,1,"apitimeout" , "Plugin API timeout in seconds [default 10]"}, + + {SET_APITIMEOUT ,1,"apitimeout" , "Binding API timeout in seconds [default 10]"}, {SET_CNTXTIMEOUT ,1,"cntxtimeout" , "Client Session Context Timeout [default 900]"}, - {SET_CACHE_TIMEOUT,1,"cache-eol" , "Client cache end of live [default 3600s]"}, - + {SET_CACHE_TIMEOUT,1,"cache-eol" , "Client cache end of live [default 3600]"}, + {SET_SESSION_DIR ,1,"sessiondir" , "Sessions file path [default rootdir/sessions]"}, - {SET_LDPATH ,1,"ldpaths" , "Load Plugins from dir1:dir2:... [default = PLUGIN_INSTALL_DIR"}, + {SET_LDPATH ,1,"ldpaths" , "Load bindingss from dir1:dir2:... [default = "BINDING_INSTALL_DIR"]"}, {SET_AUTH_TOKEN ,1,"token" , "Initial Secret [default=no-session, --token="" for session without authentication]"}, - + {DISPLAY_VERSION ,0,"version" , "Display version and copyright"}, {DISPLAY_HELP ,0,"help" , "Display this help"}, @@ -117,7 +127,11 @@ 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"}, - {SO_PLUGIN ,1,"plugin" , "load the plugin of path"}, + {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]"}, {0, 0, NULL, NULL} }; @@ -131,7 +145,7 @@ 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) 2016 /IoT.bzh [fulup -at- iot.bzh]\n"); + fprintf(file, " Copyright (C) 2015, 2016 \"IoT.bzh\" [fulup -at- iot.bzh]\n"); fprintf(file, " AFB comes with ABSOLUTELY NO WARRANTY.\n"); fprintf(file, " Licence Apache 2\n\n"); exit (0); @@ -159,7 +173,7 @@ static void printHelp(FILE *file, const char *name) fprintf (file, " --%-15s %s\n", command, cliOptions[ind].help); } } - fprintf (file, "Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/plugins:/usr/lib64/agl/plugins\n", name); + fprintf (file, "Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/bindings:/usr/lib64/agl/bindings\n", name); } // load config from disk and merge with CLI option @@ -168,11 +182,11 @@ static void config_set_default (struct afb_config * config) // default HTTP port if (config->httpdPort == 0) config->httpdPort = 1234; - - // default Plugin API timeout + + // default binding API timeout if (config->apiTimeout == 0) config->apiTimeout = DEFLT_API_TIMEOUT; - + // default AUTH_TOKEN if (config->token == NULL) config->token = DEFLT_AUTH_TOKEN; @@ -185,6 +199,10 @@ static void config_set_default (struct afb_config * config) if (config->cntxTimeout == 0) config->cntxTimeout = DEFLT_CNTX_TIMEOUT; + // max count of sessions + if (config->nbSessionMax == 0) + config->nbSessionMax = CTX_NBCLIENTS; + if (config->rootdir == NULL) { config->rootdir = getenv("AFBDIR"); if (config->rootdir == NULL) { @@ -195,16 +213,19 @@ static void config_set_default (struct afb_config * config) // if directory does not exist createit mkdir (config->rootdir, O_RDWR | S_IRWXU | S_IRGRP); } - + // if no Angular/HTML5 rootbase let's try '/' as default + if (config->roothttp == NULL) + config->roothttp = "."; + if (config->rootbase == NULL) config->rootbase = "/opa"; - + if (config->rootapi == NULL) config->rootapi = "/api"; if (config->ldpaths == NULL) - config->ldpaths = PLUGIN_INSTALL_DIR; + config->ldpaths = BINDING_INSTALL_DIR; // if no session dir create a default path from rootdir if (config->sessiondir == NULL) { @@ -280,7 +301,7 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) if (optarg == 0) goto needValueForOption; if (!sscanf (optarg, "%d", &config->httpdPort)) goto notAnInteger; break; - + case SET_APITIMEOUT: if (optarg == 0) goto needValueForOption; if (!sscanf (optarg, "%d", &config->apiTimeout)) goto notAnInteger; @@ -295,8 +316,14 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) if (optarg == 0) goto needValueForOption; config->rootdir = optarg; INFO("Forcing Rootdir=%s",config->rootdir); - break; - + 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; @@ -308,7 +335,7 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) config->rootapi = optarg; INFO("Forcing Rootapi=%s",config->rootapi); break; - + case SET_ALIAS: if (optarg == 0) goto needValueForOption; if ((unsigned)config->aliascount < sizeof (config->aliasdir) / sizeof (config->aliasdir[0])) { @@ -322,9 +349,9 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) } } else { ERROR("Too many aliases [max:%d] %s ignored", MAX_ALIAS, optarg); - } + } break; - + case SET_AUTH_TOKEN: if (optarg == 0) goto needValueForOption; config->token = optarg; @@ -345,6 +372,11 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) if (!sscanf (optarg, "%d", &config->cacheTimeout)) goto notAnInteger; break; + case SET_SESSIONMAX: + if (optarg == 0) goto needValueForOption; + if (!sscanf (optarg, "%d", &config->nbSessionMax)) goto notAnInteger; + break; + case SET_FORGROUND: if (optarg != 0) goto noValueForOption; config->background = 0; @@ -370,7 +402,9 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) case DBUS_CLIENT: case DBUS_SERVICE: - case SO_PLUGIN: + case WS_CLIENT: + case WS_SERVICE: + case SO_BINDING: if (optarg == 0) goto needValueForOption; add_item(config, optc, optarg); break; @@ -387,7 +421,7 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) } } free(gnuOptions); - + config_set_default (config); return; @@ -470,7 +504,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; @@ -479,10 +515,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)) + 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)) + 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)) @@ -545,9 +581,21 @@ static void start_items(struct afb_config_item *item) exit(1); } break; - case SO_PLUGIN: - if (afb_api_so_add_plugin(item->value) < 0) { - ERROR("can't start the plugin of path %s",item->value); + 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); exit(1); } break; @@ -584,13 +632,18 @@ int main(int argc, char *argv[]) { exit (1); } - if (config->ldpaths) - afb_api_so_add_pathset(config->ldpaths); + afb_api_so_set_timeout(config->apiTimeout); + if (config->ldpaths) { + if (afb_api_so_add_pathset(config->ldpaths) < 0) { + ERROR("initialisation of bindings within %s failed", config->ldpaths); + exit(1); + } + } start_items(config->items); config->items = NULL; - ctxStoreInit(CTX_NBCLIENTS, config->cntxTimeout, config->token, afb_apis_count()); + ctxStoreInit(config->nbSessionMax, config->cntxTimeout, config->token, afb_apis_count()); if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, DEFLT_CNTX_TIMEOUT)) { ERROR("initialisation of cookies failed"); exit (1); @@ -601,6 +654,11 @@ int main(int argc, char *argv[]) { return 1; } + if (afb_common_rootdir_set(config->rootdir) < 0) { + ERROR("main fail to set common root directory"); + return 1; + } + // let's run this program with a low priority nice (20); @@ -620,10 +678,15 @@ int main(int argc, char *argv[]) { INFO("entering foreground mode"); } + /* start the HTTP server */ hsrv = start_http_server(config); if (hsrv == NULL) exit(1); + /* start the services */ + if (afb_apis_start_all_services(1) < 0) + exit(1); + if (config->readyfd != 0) { static const char readystr[] = "READY=1"; write(config->readyfd, readystr, sizeof(readystr) - 1);