X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=156a77d297b4962c09b29e6edb27ac70509c7e46;hb=e68a315bcf2bd681466c27026fea73598071bda6;hp=ba19925bf24b5e4cb7eca890b7dc0bd21d1f25d3;hpb=7ea1657b459aea2cc6ef9332621a19d7e2676b1d;p=src%2Fapp-framework-binder.git diff --git a/src/main.c b/src/main.c index ba19925b..156a77d2 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 * @@ -20,17 +20,11 @@ #include #include -#include #include #include #include #include -#include - #include -#include -#include -#include #include @@ -38,14 +32,16 @@ #include "afb-hswitch.h" #include "afb-apis.h" #include "afb-api-so.h" +#include "afb-api-dbus.h" #include "afb-hsrv.h" #include "afb-context.h" #include "afb-hreq.h" +#include "afb-sig-handler.h" #include "session.h" #include "verbose.h" #include "afb-common.h" -#include "afb-plugin.h" +#include #if !defined(PLUGIN_INSTALL_DIR) #error "you should define PLUGIN_INSTALL_DIR" @@ -78,6 +74,10 @@ #define SET_MODE 18 #define SET_READYFD 19 +#define DBUS_CLIENT 20 +#define DBUS_SERVICE 21 +#define SO_PLUGIN 22 + // Command line structure hold cli --command + help text typedef struct { int val; // command number within application @@ -114,10 +114,13 @@ static AFB_options cliOptions [] = { {SET_MODE ,1,"mode" , "set the mode: either local, remote or global"}, {SET_READYFD ,1,"readyfd" , "set the #fd to signal when ready"}, - {0, 0, NULL, NULL} - }; + {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"}, + {0, 0, NULL, NULL} + }; /*---------------------------------------------------------- | printversion @@ -128,7 +131,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); @@ -224,6 +227,19 @@ static void config_set_default (struct afb_config * config) | Parse option and launch action +--------------------------------------------------------- */ +static void add_item(struct afb_config *config, int kind, char *value) +{ + struct afb_config_item *item = malloc(sizeof *item); + if (item == NULL) { + ERROR("out of memory"); + exit(1); + } + item->kind = kind; + item->value = value; + item->previous = config->items; + config->items = item; +} + static void parse_arguments(int argc, char *argv[], struct afb_config *config) { char* programName = argv [0]; @@ -352,6 +368,13 @@ static void parse_arguments(int argc, char *argv[], struct afb_config *config) if (!sscanf (optarg, "%u", &config->readyfd)) goto notAnInteger; break; + case DBUS_CLIENT: + case DBUS_SERVICE: + case SO_PLUGIN: + if (optarg == 0) goto needValueForOption; + add_item(config, optc, optarg); + break; + case DISPLAY_VERSION: if (optarg != 0) goto noValueForOption; printVersion(stdout); @@ -398,50 +421,6 @@ static void closeSession (int status, void *data) { /* struct afb_config *config = data; */ } -/*---------------------------------------------------------- - | timeout signalQuit - +--------------------------------------------------------- */ -void signalQuit (int signum) -{ - ERROR("Terminating signal received %s", strsignal(signum)); - exit(1); -} - - -/*---------------------------------------------------------- - | Error signals - | - +--------------------------------------------------------- */ -__thread sigjmp_buf *error_handler; -static void signalError(int signum) -{ - sigset_t sigset; - - // unlock signal to allow a new signal to come - if (error_handler != NULL) { - sigemptyset(&sigset); - sigaddset(&sigset, signum); - sigprocmask(SIG_UNBLOCK, &sigset, 0); - longjmp(*error_handler, signum); - } - if (signum == SIGALRM) - return; - ERROR("Unmonitored signal received %s", strsignal(signum)); - exit(2); -} - -static void install_error_handlers() -{ - int i, signals[] = { SIGALRM, SIGSEGV, SIGFPE, 0 }; - - for (i = 0; signals[i] != 0; i++) { - if (signal(signals[i], signalError) == SIG_ERR) { - ERROR("Signal handler error"); - exit(1); - } - } -} - /*---------------------------------------------------------- | daemonize | set the process in background @@ -500,10 +479,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, config->aliasdir[idx].path, 0, 0)) return 0; - if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10)) + if (!afb_hsrv_add_alias(hsrv, "", config->rootdir, -10, 1)) return 0; if (!afb_hsrv_add_handler(hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL, -20)) @@ -548,6 +527,38 @@ static struct afb_hsrv *start_http_server(struct afb_config * config) return hsrv; } +static void start_items(struct afb_config_item *item) +{ + if (item != NULL) { + /* keeps the order */ + start_items(item->previous); + switch(item->kind) { + case DBUS_CLIENT: + if (afb_api_dbus_add_client(item->value) < 0) { + ERROR("can't start the afb-dbus client of path %s",item->value); + exit(1); + } + break; + case DBUS_SERVICE: + if (afb_api_dbus_add_server(item->value) < 0) { + ERROR("can't start the afb-dbus service of path %s",item->value); + 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); + exit(1); + } + break; + default: + ERROR("unexpected internal error"); + exit(1); + } + /* frre the item */ + free(item); + } +} /*--------------------------------------------------------- | main @@ -559,8 +570,7 @@ int main(int argc, char *argv[]) { struct afb_config *config; struct sd_event *eventloop; - // open syslog if ever needed - openlog("afb-daemon", 0, LOG_DAEMON); + LOGAUTH("afb-daemon"); // ------------- Build session handler & init config ------- config = calloc (1, sizeof (struct afb_config)); @@ -574,8 +584,15 @@ int main(int argc, char *argv[]) { exit (1); } - if (config->ldpaths) - afb_api_so_add_pathset(config->ldpaths); + if (config->ldpaths) { + if (afb_api_so_add_pathset(config->ldpaths) < 0) { + ERROR("initialisation of plugins within %s failed", config->ldpaths); + exit(1); + } + } + + start_items(config->items); + config->items = NULL; ctxStoreInit(CTX_NBCLIENTS, config->cntxTimeout, config->token, afb_apis_count()); if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, DEFLT_CNTX_TIMEOUT)) { @@ -583,11 +600,8 @@ int main(int argc, char *argv[]) { exit (1); } - install_error_handlers(); - - // ------------------ clean exit on CTR-C signal ------------------------ - if (signal (SIGINT, signalQuit) == SIG_ERR || signal (SIGABRT, signalQuit) == SIG_ERR) { - ERROR("main fail to install Signal handler"); + if (afb_sig_handler_init() < 0) { + ERROR("main fail to initialise signal handlers"); return 1; }